| 1 |
commit: f9997f4e52f70e127432abc01df04c18760fa391 |
| 2 |
Author: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 3 |
AuthorDate: Tue Mar 25 20:52:41 2014 +0000 |
| 4 |
Commit: André Erdmann <dywi <AT> mailerd <DOT> de> |
| 5 |
CommitDate: Tue Mar 25 20:52:41 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/R_overlay.git;a=commit;h=f9997f4e |
| 7 |
|
| 8 |
fix potential python 2 issue |
| 9 |
|
| 10 |
Python 2 checks for __nonzero__(), not __bool__(). roverlay usually relies |
| 11 |
explicit checks ("if obj.attr == $expected" or "obj.exists()" rather than |
| 12 |
"if object:"), so this is not a major issue. |
| 13 |
|
| 14 |
--- |
| 15 |
roverlay/db/distmap.py | 4 ++++ |
| 16 |
roverlay/depres/depresult.py | 4 ++++ |
| 17 |
roverlay/depres/simpledeprule/util.py | 3 +++ |
| 18 |
roverlay/overlay/additionsdir.py | 7 ++++++- |
| 19 |
roverlay/stats/abstract.py | 4 ++++ |
| 20 |
roverlay/util/objects.py | 8 ++++++++ |
| 21 |
6 files changed, 29 insertions(+), 1 deletion(-) |
| 22 |
|
| 23 |
diff --git a/roverlay/db/distmap.py b/roverlay/db/distmap.py |
| 24 |
index 818d5d0..76196f8 100644 |
| 25 |
--- a/roverlay/db/distmap.py |
| 26 |
+++ b/roverlay/db/distmap.py |
| 27 |
@@ -244,6 +244,10 @@ class _DistMapBase ( roverlay.util.objects.PersistentContent ): |
| 28 |
return True |
| 29 |
# --- end of __bool__ (...) --- |
| 30 |
|
| 31 |
+ def __nonzero__ ( self ): |
| 32 |
+ return self.__bool__() |
| 33 |
+ # --- end of __nonzero__ (...) --- |
| 34 |
+ |
| 35 |
def __setitem__ ( self, key, value ): |
| 36 |
if isinstance ( value, DistMapInfo ): |
| 37 |
self.add_entry ( key, value ) |
| 38 |
|
| 39 |
diff --git a/roverlay/depres/depresult.py b/roverlay/depres/depresult.py |
| 40 |
index b95a1bc..f14f06d 100644 |
| 41 |
--- a/roverlay/depres/depresult.py |
| 42 |
+++ b/roverlay/depres/depresult.py |
| 43 |
@@ -46,6 +46,10 @@ class ConstantDepResult ( object ): |
| 44 |
#and self.dep is not False |
| 45 |
# --- end of __bool__ (...) --- |
| 46 |
|
| 47 |
+ def __nonzero__ ( self ): |
| 48 |
+ return self.__bool__() |
| 49 |
+ # --- end of __nonzero__ (...) --- |
| 50 |
+ |
| 51 |
def __hash__ ( self ): |
| 52 |
return hash ( self.dep ) |
| 53 |
# --- end of __hash__ (...) --- |
| 54 |
|
| 55 |
diff --git a/roverlay/depres/simpledeprule/util.py b/roverlay/depres/simpledeprule/util.py |
| 56 |
index 0ce5aa4..36f88cd 100644 |
| 57 |
--- a/roverlay/depres/simpledeprule/util.py |
| 58 |
+++ b/roverlay/depres/simpledeprule/util.py |
| 59 |
@@ -41,6 +41,9 @@ class SlotRestrict ( object ): |
| 60 |
def __bool__ ( self ): |
| 61 |
return True |
| 62 |
|
| 63 |
+ def __nonzero__ ( self ): |
| 64 |
+ return self.__bool__() |
| 65 |
+ |
| 66 |
def noexport ( self ): |
| 67 |
pass |
| 68 |
|
| 69 |
|
| 70 |
diff --git a/roverlay/overlay/additionsdir.py b/roverlay/overlay/additionsdir.py |
| 71 |
index 5e24622..6e795a6 100644 |
| 72 |
--- a/roverlay/overlay/additionsdir.py |
| 73 |
+++ b/roverlay/overlay/additionsdir.py |
| 74 |
@@ -24,7 +24,8 @@ class AdditionsDir ( object ): |
| 75 |
return self.root is not None and os.path.isdir ( self.root ) |
| 76 |
# --- end of exists (...) --- |
| 77 |
|
| 78 |
- __bool__ = exists |
| 79 |
+ __bool__ = exists |
| 80 |
+ __nonzero__ = exists |
| 81 |
|
| 82 |
def iter_entries ( self ): |
| 83 |
"""Generator that yields the directory content of this dir.""" |
| 84 |
@@ -95,6 +96,10 @@ class _AdditionsDirView ( object ): |
| 85 |
return bool ( self._additions_dir ) |
| 86 |
# --- end of __bool__ (...) --- |
| 87 |
|
| 88 |
+ def __nonzero__ ( self ): |
| 89 |
+ return self.__bool__() |
| 90 |
+ # --- end of __nonzero__ (...) --- |
| 91 |
+ |
| 92 |
@property |
| 93 |
def name ( self ): |
| 94 |
return self._additions_dir.name |
| 95 |
|
| 96 |
diff --git a/roverlay/stats/abstract.py b/roverlay/stats/abstract.py |
| 97 |
index c2ecace..6ad39f9 100644 |
| 98 |
--- a/roverlay/stats/abstract.py |
| 99 |
+++ b/roverlay/stats/abstract.py |
| 100 |
@@ -258,6 +258,10 @@ class Counter ( RoverlayStatsBase ): |
| 101 |
return bool ( self.total_count ) |
| 102 |
# --- end of __bool__ (...) --- |
| 103 |
|
| 104 |
+ def __nonzero__ ( self ): |
| 105 |
+ return self.__bool__() |
| 106 |
+ # --- end of __nonzero__ (...) --- |
| 107 |
+ |
| 108 |
def __add__ ( self, other ): |
| 109 |
return self.total_count + int ( other ) |
| 110 |
# --- end of __add__ (...) --- |
| 111 |
|
| 112 |
diff --git a/roverlay/util/objects.py b/roverlay/util/objects.py |
| 113 |
index d14733e..9c73749 100644 |
| 114 |
--- a/roverlay/util/objects.py |
| 115 |
+++ b/roverlay/util/objects.py |
| 116 |
@@ -55,6 +55,8 @@ class SafeWeakRef ( weakref.ref ): |
| 117 |
return self.deref_unsafe() is not None |
| 118 |
# --- end of __bool__ (...) --- |
| 119 |
|
| 120 |
+ __nonzero__ = __bool__ |
| 121 |
+ |
| 122 |
def __repr__ ( self ): |
| 123 |
obj = self.deref_unsafe() |
| 124 |
if obj: |
| 125 |
@@ -104,6 +106,8 @@ class NoneRef ( object ): |
| 126 |
return False |
| 127 |
# --- end of __bool__ (...) --- |
| 128 |
|
| 129 |
+ __nonzero__ = __bool__ |
| 130 |
+ |
| 131 |
def __repr__ ( self ): |
| 132 |
return "<NoneRef at 0x{:x}>".format ( id ( self ) ) |
| 133 |
# --- end of __repr__ (...) --- |
| 134 |
@@ -360,6 +364,10 @@ class ObjectView ( object ): |
| 135 |
return bool ( self.obj_ref ) |
| 136 |
# --- end of __bool__ (...) --- |
| 137 |
|
| 138 |
+ def __nonzero__ ( self ): |
| 139 |
+ return self.__bool__() |
| 140 |
+ # --- end of __nonzero__ (...) --- |
| 141 |
+ |
| 142 |
@abstractmethod |
| 143 |
def update ( self ): |
| 144 |
"""Updates this view (collect data from the actual object etc.).""" |
Archives