diff options
author | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 17:41:45 +0000 |
---|---|---|
committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 17:41:45 +0000 |
commit | cdd7a8350d5ad23c49c916399dfaace2cd4ab99a (patch) | |
tree | 4881d84340d833b0fdbc8f8b77d61f4c001f15b6 /pym/portage | |
parent | 1e41a53912fa53b74577752cbbad7cbdd4e2afef (diff) | |
download | portage-cdd7a8350d5ad23c49c916399dfaace2cd4ab99a.tar.gz portage-cdd7a8350d5ad23c49c916399dfaace2cd4ab99a.tar.bz2 portage-cdd7a8350d5ad23c49c916399dfaace2cd4ab99a.zip |
Define long as int when Python 3 is used.
svn path=/main/trunk/; revision=14343
Diffstat (limited to 'pym/portage')
-rw-r--r-- | pym/portage/__init__.py | 1 | ||||
-rw-r--r-- | pym/portage/cache/flat_hash.py | 4 | ||||
-rw-r--r-- | pym/portage/cache/flat_list.py | 4 | ||||
-rw-r--r-- | pym/portage/cache/fs_template.py | 4 | ||||
-rw-r--r-- | pym/portage/cache/metadata.py | 1 | ||||
-rw-r--r-- | pym/portage/cache/template.py | 1 | ||||
-rw-r--r-- | pym/portage/cvstree.py | 4 | ||||
-rw-r--r-- | pym/portage/dbapi/bintree.py | 1 | ||||
-rw-r--r-- | pym/portage/dbapi/porttree.py | 4 | ||||
-rw-r--r-- | pym/portage/dbapi/vartree.py | 1 | ||||
-rw-r--r-- | pym/portage/eclass_cache.py | 4 | ||||
-rw-r--r-- | pym/portage/getbinpkg.py | 3 | ||||
-rw-r--r-- | pym/portage/update.py | 3 |
13 files changed, 35 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 043486542..e2fd1fbaa 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -125,6 +125,7 @@ except ImportError as e: if sys.hexversion >= 0x3000000: basestring = str + long = int # Assume utf_8 fs encoding everywhere except in merge code, where the # user's locale is respected. diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py index 3f46df8b9..918c935f5 100644 --- a/pym/portage/cache/flat_hash.py +++ b/pym/portage/cache/flat_hash.py @@ -8,10 +8,14 @@ from portage.cache import fs_template from portage.cache import cache_errors import errno import stat +import sys from portage import os from portage import _encodings from portage import _unicode_encode +if sys.hexversion >= 0x3000000: + long = int + class database(fs_template.FsBased): autocommits = True diff --git a/pym/portage/cache/flat_list.py b/pym/portage/cache/flat_list.py index cfa3340cd..c7d618c26 100644 --- a/pym/portage/cache/flat_list.py +++ b/pym/portage/cache/flat_list.py @@ -6,6 +6,10 @@ from portage import _unicode_encode import codecs import errno import stat +import sys + +if sys.hexversion >= 0x3000000: + long = int # store the current key order *here*. class database(fs_template.FsBased): diff --git a/pym/portage/cache/fs_template.py b/pym/portage/cache/fs_template.py index 97be3ab77..7cd8af4d7 100644 --- a/pym/portage/cache/fs_template.py +++ b/pym/portage/cache/fs_template.py @@ -3,6 +3,7 @@ # License: GPL2 # $Id$ +import sys from portage.cache import template from portage import os @@ -14,6 +15,9 @@ lazyimport(globals(), ) del lazyimport +if sys.hexversion >= 0x3000000: + long = int + class FsBased(template.database): """template wrapping fs needed options, and providing _ensure_access as a way to attempt to ensure files have the specified owners/perms""" diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py index 8518c0e69..3f8ff1149 100644 --- a/pym/portage/cache/metadata.py +++ b/pym/portage/cache/metadata.py @@ -16,6 +16,7 @@ from portage.cache.mappings import ProtectedDict if sys.hexversion >= 0x3000000: basestring = str + long = int # this is the old cache format, flat_list. count maintained here. magic_line_count = 22 diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py index e90c9dba5..650f5135d 100644 --- a/pym/portage/cache/template.py +++ b/pym/portage/cache/template.py @@ -11,6 +11,7 @@ import warnings if sys.hexversion >= 0x3000000: basestring = str + long = int class database(object): # this is for metadata/cache transfer. diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py index eaf7f37a5..87724adf1 100644 --- a/pym/portage/cvstree.py +++ b/pym/portage/cvstree.py @@ -7,12 +7,16 @@ from __future__ import print_function import codecs import re +import sys import time from portage import os from portage import _encodings from portage import _unicode_encode +if sys.hexversion >= 0x3000000: + long = int + # [D]/Name/Version/Date/Flags/Tags def pathdata(entries, path): diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py index ff277a8fa..818dba9cf 100644 --- a/pym/portage/dbapi/bintree.py +++ b/pym/portage/dbapi/bintree.py @@ -34,6 +34,7 @@ from itertools import chain if sys.hexversion >= 0x3000000: basestring = str + long = int class bindbapi(fakedbapi): _known_keys = frozenset(list(fakedbapi._known_keys) + \ diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py index bf97af63e..f0950ce95 100644 --- a/pym/portage/dbapi/porttree.py +++ b/pym/portage/dbapi/porttree.py @@ -35,8 +35,12 @@ from portage import _unicode_encode import codecs import logging import stat +import sys import warnings +if sys.hexversion >= 0x3000000: + long = int + def _src_uri_validate(cpv, eapi, src_uri): """ Take a SRC_URI structure as returned by paren_reduce or use_reduce diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 635ba6026..12dd15f1b 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -60,6 +60,7 @@ except ImportError: if sys.hexversion >= 0x3000000: basestring = str + long = int class PreservedLibsRegistry(object): """ This class handles the tracking of preserved library objects """ diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py index 2c3c66c86..26019400b 100644 --- a/pym/portage/eclass_cache.py +++ b/pym/portage/eclass_cache.py @@ -5,12 +5,16 @@ __all__ = ["cache"] +import sys import warnings from portage.util import normalize_path import errno from portage.exception import PermissionDenied from portage import os +if sys.hexversion >= 0x3000000: + long = int + class cache(object): """ Maintains the cache information about eclasses used in ebuild. diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py index 35bef052a..95bd1dbc6 100644 --- a/pym/portage/getbinpkg.py +++ b/pym/portage/getbinpkg.py @@ -51,6 +51,9 @@ try: except ImportError as e: sys.stderr.write(colorize("BAD","!!! CANNOT IMPORT HTTP.CLIENT: ")+str(e)+"\n") +if sys.hexversion >= 0x3000000: + long = int + def make_metadata_dict(data): myid,myglob = data diff --git a/pym/portage/update.py b/pym/portage/update.py index 1ea15e7e9..5e6937d44 100644 --- a/pym/portage/update.py +++ b/pym/portage/update.py @@ -24,6 +24,9 @@ from portage.const import USER_CONFIG_PATH from portage.exception import DirectoryNotFound, InvalidAtom, PortageException from portage.localization import _ +if sys.hexversion >= 0x3000000: + long = int + ignored_dbentries = ("CONTENTS", "environment.bz2") def update_dbentry(update_cmd, mycontent): |