diff options
Diffstat (limited to 'pym/_emerge')
-rw-r--r-- | pym/_emerge/BinpkgFetcher.py | 3 | ||||
-rw-r--r-- | pym/_emerge/BlockerCache.py | 1 | ||||
-rw-r--r-- | pym/_emerge/BlockerDB.py | 5 | ||||
-rw-r--r-- | pym/_emerge/FakeVartree.py | 5 | ||||
-rw-r--r-- | pym/_emerge/Package.py | 1 | ||||
-rw-r--r-- | pym/_emerge/actions.py | 3 | ||||
-rw-r--r-- | pym/_emerge/depgraph.py | 1 | ||||
-rw-r--r-- | pym/_emerge/main.py | 3 |
8 files changed, 22 insertions, 0 deletions
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py index 576d00a60..fbf34df72 100644 --- a/pym/_emerge/BinpkgFetcher.py +++ b/pym/_emerge/BinpkgFetcher.py @@ -11,6 +11,9 @@ import sys import portage from portage import os +if sys.hexversion >= 0x3000000: + long = int + class BinpkgFetcher(SpawnProcess): __slots__ = ("pkg", "pretend", diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py index 7c6be8ada..f88a7c43f 100644 --- a/pym/_emerge/BlockerCache.py +++ b/pym/_emerge/BlockerCache.py @@ -15,6 +15,7 @@ except ImportError: if sys.hexversion >= 0x3000000: basestring = str + long = int class BlockerCache(portage.cache.mappings.MutableMapping): """This caches blockers of installed packages so that dep_check does not diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py index 436793c59..1c4af1cae 100644 --- a/pym/_emerge/BlockerDB.py +++ b/pym/_emerge/BlockerDB.py @@ -2,6 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +import sys + import portage from portage import os from portage import digraph @@ -11,6 +13,9 @@ from _emerge.BlockerCache import BlockerCache from _emerge.FakeVartree import FakeVartree from _emerge.show_invalid_depstring_notice import show_invalid_depstring_notice +if sys.hexversion >= 0x3000000: + long = int + class BlockerDB(object): def __init__(self, root_config): diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 98d08891c..96d13bd28 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -2,11 +2,16 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ +import sys + import portage from portage import os from _emerge.Package import Package from _emerge.PackageVirtualDbapi import PackageVirtualDbapi +if sys.hexversion >= 0x3000000: + long = int + class FakeVartree(portage.vartree): """This is implements an in-memory copy of a vartree instance that provides all the interfaces required for use by the depgraph. The vardb is locked diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py index 15471d1b2..ad15dc646 100644 --- a/pym/_emerge/Package.py +++ b/pym/_emerge/Package.py @@ -12,6 +12,7 @@ from _emerge.Task import Task if sys.hexversion >= 0x3000000: basestring = str + long = int class Package(Task): diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index 0bdda1fc5..4cae98f29 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -55,6 +55,9 @@ from _emerge.UnmergeDepPriority import UnmergeDepPriority from _emerge.UseFlagDisplay import UseFlagDisplay from _emerge.userquery import userquery +if sys.hexversion >= 0x3000000: + long = int + def action_build(settings, trees, mtimedb, myopts, myaction, myfiles, spinner): diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index ed2e88af4..d20016c90 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -53,6 +53,7 @@ from _emerge.visible import visible if sys.hexversion >= 0x3000000: basestring = str + long = int class _frozen_depgraph_config(object): diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index 09522375f..777d10192 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -44,6 +44,9 @@ from _emerge._flush_elog_mod_echo import _flush_elog_mod_echo from _emerge.is_valid_package_atom import is_valid_package_atom from _emerge.stdout_spinner import stdout_spinner +if sys.hexversion >= 0x3000000: + long = int + options=[ "--ask", "--alphabetical", "--buildpkg", "--buildpkgonly", |