| 1 |
Author: zmedico |
| 2 |
Date: 2008-11-01 05:44:28 +0000 (Sat, 01 Nov 2008) |
| 3 |
New Revision: 11777 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Rename "object" variable to avoid name collision with the builtin class. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 05:32:30 UTC (rev 11776) |
| 14 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2008-11-01 05:44:28 UTC (rev 11777) |
| 15 |
@@ -156,7 +156,7 @@ |
| 16 |
|
| 17 |
__slots__ = ("__weakref__", "_key") |
| 18 |
|
| 19 |
- def __init__(self, object, root): |
| 20 |
+ def __init__(self, obj, root): |
| 21 |
""" |
| 22 |
This takes a path to an object. |
| 23 |
|
| 24 |
@@ -164,7 +164,7 @@ |
| 25 |
@type object: string (example: '/usr/bin/bar') |
| 26 |
|
| 27 |
""" |
| 28 |
- self._key = self._generate_object_key(object, root) |
| 29 |
+ self._key = self._generate_object_key(obj, root) |
| 30 |
|
| 31 |
def __hash__(self): |
| 32 |
return hash(self._key) |
| 33 |
@@ -172,7 +172,7 @@ |
| 34 |
def __eq__(self, other): |
| 35 |
return self._key == other._key |
| 36 |
|
| 37 |
- def _generate_object_key(self, object, root): |
| 38 |
+ def _generate_object_key(self, obj, root): |
| 39 |
""" |
| 40 |
Generate object key for a given object. |
| 41 |
|
| 42 |
@@ -186,7 +186,7 @@ |
| 43 |
2. realpath of object if object does not exist. |
| 44 |
|
| 45 |
""" |
| 46 |
- abs_path = os.path.join(root, object.lstrip(os.path.sep)) |
| 47 |
+ abs_path = os.path.join(root, obj.lstrip(os.sep)) |
| 48 |
try: |
| 49 |
object_stat = os.stat(abs_path) |
| 50 |
except OSError: |
Archives