diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-01 05:44:28 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-01 05:44:28 +0000 |
| commit | d0217dc6e09a5fb3f810e947e08b3f6543a1dd83 (patch) | |
| tree | 6e55774ca643314a707aa3eeb1772d0c0c88f58d | |
| parent | b3592fdc86d9fc7b76deff4eeedf86d3ea50f9c1 (diff) | |
| download | portage-d0217dc6e09a5fb3f810e947e08b3f6543a1dd83.tar.gz portage-d0217dc6e09a5fb3f810e947e08b3f6543a1dd83.tar.bz2 portage-d0217dc6e09a5fb3f810e947e08b3f6543a1dd83.zip | |
Rename "object" variable to avoid name collision with the builtin class.
svn path=/main/trunk/; revision=11777
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index e1da2084f..187017fca 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -156,7 +156,7 @@ class LinkageMap(object): __slots__ = ("__weakref__", "_key") - def __init__(self, object, root): + def __init__(self, obj, root): """ This takes a path to an object. @@ -164,7 +164,7 @@ class LinkageMap(object): @type object: string (example: '/usr/bin/bar') """ - self._key = self._generate_object_key(object, root) + self._key = self._generate_object_key(obj, root) def __hash__(self): return hash(self._key) @@ -172,7 +172,7 @@ class LinkageMap(object): def __eq__(self, other): return self._key == other._key - def _generate_object_key(self, object, root): + def _generate_object_key(self, obj, root): """ Generate object key for a given object. @@ -186,7 +186,7 @@ class LinkageMap(object): 2. realpath of object if object does not exist. """ - abs_path = os.path.join(root, object.lstrip(os.path.sep)) + abs_path = os.path.join(root, obj.lstrip(os.sep)) try: object_stat = os.stat(abs_path) except OSError: |