Merged from trunk -r14354:14358

   | 14355    | Use next(iterator) instead of iterator.next() for           |
   | arfrever | compatibility with Python 3. (2to3-3.1 -f next -nw          |
   |          | ${FILES})                                                   |

   | 14357    | Decode database name passed to                              |
   | arfrever | portage.cache.sqlite.database._db_module.connect() for      |
   |          | compatibility with Python 3.                                |

   | 14358    | Use input() instead of raw_input() when Python 3 is used.   |
   | arfrever |                                                             |

svn path=/main/branches/prefix/; revision=14360

diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index 1c4af1cae2fe5e53467da799de3b2b9e47456047..8367ec6513a09e8f61b05f645f31d03006b4bca1 100644 (file)
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -119,7 +119,7 @@ class BlockerDB(object):
                        blocker_atoms = InternalPackageSet(initial_atoms=blocker_atoms)
                        for inst_pkg in installed_pkgs:
                                try:
-                                       blocker_atoms.iterAtomsForPackage(inst_pkg).next()
+                                       next(blocker_atoms.iterAtomsForPackage(inst_pkg))
                                except (portage.exception.InvalidDependString, StopIteration):
                                        continue
                                blocking_pkgs.add(inst_pkg)

diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py
index 88b157fd0f4e20be5b56defd369ad337e0b8d9cb..6bfd722c262cd250cba474463e673689359d9425 100644 (file)
--- a/pym/_emerge/MetadataRegen.py
+++ b/pym/_emerge/MetadataRegen.py
@@ -135,7 +135,7 @@ class MetadataRegen(PollScheduler):
                """
                while self._can_add_job():
                        try:
-                               metadata_process = self._process_iter.next()
+                               metadata_process = next(self._process_iter)
                        except StopIteration:
                                return False
 

diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 6cfc9c54723ea74b30f2beef5193dab827c8c7e7..e8d1600af4845acded5a40acb55f8a84afa7fff4 100644 (file)
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -747,7 +747,7 @@ class depgraph(object):
                        myarg = None
                        if dep.root == self._frozen_config.target_root:
                                try:
-                                       myarg = self._iter_atoms_for_pkg(dep_pkg).next()
+                                       myarg = next(self._iter_atoms_for_pkg(dep_pkg))
                                except StopIteration:
                                        pass
                                except portage.exception.InvalidDependString:
@@ -1463,7 +1463,7 @@ class depgraph(object):
                                                installed_cp_set = non_virtual_cps
 
                                if len(expanded_atoms) > 1 and len(installed_cp_set) == 1:
-                                       installed_cp = iter(installed_cp_set).next()
+                                       installed_cp = next(iter(installed_cp_set))
                                        expanded_atoms = [atom for atom in expanded_atoms \
                                                if atom.cp == installed_cp]
 
@@ -2280,7 +2280,7 @@ class depgraph(object):
                                        myarg = None
                                        if root == self._frozen_config.target_root:
                                                try:
-                                                       myarg = self._iter_atoms_for_pkg(pkg).next()
+                                                       myarg = next(self._iter_atoms_for_pkg(pkg))
                                                except StopIteration:
                                                        pass
                                                except portage.exception.InvalidDependString:
@@ -4925,7 +4925,7 @@ class _dep_check_composite_db(portage.dbapi):
        def _visible(self, pkg):
                if pkg.installed and "selective" not in self._depgraph._dynamic_config.myparams:
                        try:
-                               arg = self._depgraph._iter_atoms_for_pkg(pkg).next()
+                               arg = next(self._depgraph._iter_atoms_for_pkg(pkg))
                        except (StopIteration, portage.exception.InvalidDependString):
                                arg = None
                        if arg:

diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index ddcfa8180b2a1227d8346d82ff0606c610be163a..b97207d68b249aec02998f336e3a4afd4853830b 100644 (file)
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -404,7 +404,7 @@ def unmerge(root_config, myopts, unmerge_action,
                        selected = d["selected"]
                        if not selected:
                                continue
-                       cp = portage.cpv_getkey(iter(selected).next())
+                       cp = portage.cpv_getkey(next(iter(selected)))
                        cp_dict = unordered.get(cp)
                        if cp_dict is None:
                                cp_dict = {}
@@ -423,7 +423,7 @@ def unmerge(root_config, myopts, unmerge_action,
                        if mytype == "selected":
                                continue
                        mylist.difference_update(all_selected)
-               cp = portage.cpv_getkey(iter(selected).next())
+               cp = portage.cpv_getkey(next(iter(selected)))
                for y in localtree.dep_match(cp):
                        if y not in pkgmap[x]["omitted"] and \
                                y not in pkgmap[x]["selected"] and \

diff --git a/pym/_emerge/userquery.py b/pym/_emerge/userquery.py
index db8cc4c792107d60e4e15819700b99650668c3aa..5da2360070bf8d8f9ddb8581a03c08b44d69b250 100644 (file)
--- a/pym/_emerge/userquery.py
+++ b/pym/_emerge/userquery.py
@@ -38,7 +38,10 @@ def userquery(prompt, responses=None, colours=None):
        print(bold(prompt), end=' ')
        try:
                while True:
-                       response=raw_input("["+"/".join([colours[i](responses[i]) for i in range(len(responses))])+"] ")
+                       if sys.hexversion >= 0x3000000:
+                               response=input("["+"/".join([colours[i](responses[i]) for i in range(len(responses))])+"] ")
+                       else:
+                               response=raw_input("["+"/".join([colours[i](responses[i]) for i in range(len(responses))])+"] ")
                        for key in responses:
                                # An empty response will match the first value in responses.
                                if response.upper()==key[:len(response)].upper():

diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index ed1b0426188c8430689b87f4d441998ba975ceb6..b777ed1d00af30bd197a85000ebf51bad0cc36fd 100644 (file)
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -105,7 +105,7 @@ class MutableMapping(Mapping):
 
        def popitem(self):
                try:
-                       k, v = iter(self.items()).next()
+                       k, v = next(iter(self.items()))
                except StopIteration:
                        raise KeyError('container is empty')
                del self[k]
@@ -442,7 +442,7 @@ def slot_dict_class(keys, prefix="_val_"):
 
                        def popitem(self):
                                try:
-                                       k, v = iter(self.items()).next()
+                                       k, v = next(iter(self.items()))
                                except StopIteration:
                                        raise KeyError('container is empty')
                                del self[k]

diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index 48dfd3aacd5f9d7a7d7198686d5e772b3e9cc843..1ac6f1ffee49606d4089374042ae4d851ddfbf1a 100644 (file)
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -6,7 +6,7 @@ import sys
 from portage.cache import fs_template
 from portage.cache import cache_errors
 from portage import os
-from portage import _unicode_encode
+from portage import _unicode_decode
 from portage.cache.template import reconstruct_eclasses
 from portage.util import writemsg
 from portage.localization import _
@@ -67,7 +67,7 @@ class database(fs_template.FsBased):
                try:
                        self._ensure_dirs()
                        self._db_connection = self._db_module.connect(
-                               database=_unicode_encode(self._dbpath), **connection_kwargs)
+                               database=_unicode_decode(self._dbpath), **connection_kwargs)
                        self._db_cursor = self._db_connection.cursor()
                        self._db_cursor.execute("PRAGMA encoding = %s" % self._db_escape_string("UTF-8"))
                        if not self._ensure_access(self._dbpath):

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 40557de155d8a1b6b58c37e8868b8c3662052fbf..e9bde27fb110d3dd2d257ca6bd8c37f041e9eaec 100644 (file)
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -970,7 +970,7 @@ class portdbapi(dbapi):
                        if mydep != mykey:
                                cpv_iter = self._iter_match(mydep, cpv_iter)
                        try:
-                               myval = cpv_iter.next()
+                               myval = next(cpv_iter)
                        except StopIteration:
                                myval = ""
 

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index c8b9f6d44e16b56dcd94936a99210eae4ca5b476..97a613725a24bd58af2990b8519e9f57422c0e15 100644 (file)
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -153,7 +153,7 @@ class paren_normalize(list):
                for x in i:
                        if isinstance(x, basestring):
                                if x == '||':
-                                       x = self._zap_parens(i.next(), [], disjunction=True)
+                                       x = self._zap_parens(next(i), [], disjunction=True)
                                        if len(x) == 1:
                                                dest.append(x[0])
                                        else:
@@ -161,7 +161,7 @@ class paren_normalize(list):
                                                dest.append(x)
                                elif x.endswith("?"):
                                        dest.append(x)
-                                       dest.append(self._zap_parens(i.next(), []))
+                                       dest.append(self._zap_parens(next(i), []))
                                else:
                                        dest.append(x)
                        else: