Apply r11777 to LinkageMapMachO

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

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 30bd436793fe4816a4194bb3d7e17468c007db7e..6827ea05370779d6d2983b1e8e58a42652f67c71 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -635,7 +635,7 @@ class LinkageMapMachO(object):
 
                __slots__ = ("__weakref__", "_key")
 
-               def __init__(self, object, root):
+               def __init__(self, obj, root):
                        """
                        This takes a path to an object.
 
@@ -643,7 +643,7 @@ class LinkageMapMachO(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)
@@ -651,7 +651,7 @@ class LinkageMapMachO(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.
 
@@ -665,7 +665,7 @@ class LinkageMapMachO(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.path.sep))
                        try:
                                object_stat = os.stat(abs_path)
                        except OSError: