Prepare __nonzero__ for py3

Author: Daniel Nunes

Mopy/bash/ScriptParser.py

@@ -394,7 +394,7 @@ def __rshift__(self, other): return Parser.Token(self.tkn >> other.tkn)
         def __and__(self, other): return Parser.Token(self.tkn & other.tkn)
         def __xor__(self, other): return Parser.Token(self.tkn ^ other.tkn)
         def __or__(self, other): return Parser.Token(self.tkn | other.tkn)
-        def __nonzero__(self): return bool(self.tkn)
+        def __bool__(self): return bool(self.tkn)
         def __neg__(self): return Parser.Token(-self.tkn)
         def __pos__(self): return Parser.Token(+self.tkn)
         def __abs__(self): return abs(self.tkn)
@@ -407,6 +407,9 @@ def __repr__(self): return u'<Token-%s:%s>' % (Types[self.type],self.text)
         # Fall through to function/keyword
         def __call__(self, *args, **kwdargs): return self.tkn(*args, **kwdargs)
 
+        # PY3 get rid of this once we port
+        __nonzero__ = __bool__
+
 
     # Now for the Parser class
     def __init__(self,

Mopy/bash/cint.py

@@ -736,8 +736,10 @@ def __ne__(self, other):
         try: return other[1] != self.formID[1] or other[0] != self.formID[0]
         except TypeError: return False
 
-    def __nonzero__(self):
+    def __bool__(self):
         return not isinstance(self.formID, (FormID.EmptyFormID, FormID.InvalidFormID))
+    # PY3 get rid of this once we port
+    __nonzero__ = __bool__
 
     def __getitem__(self, x):
         return self.formID[0] if x == 0 else self.formID[1]
@@ -973,8 +975,10 @@ def __ne__(self, other):
         try: return other[1] != self.actorValue[1] or other[0] != self.actorValue[0]
         except TypeError: return False
 
-    def __nonzero__(self):
+    def __bool__(self):
         return not isinstance(self.actorValue, (ActorValue.EmptyActorValue, ActorValue.InvalidActorValue))
+    # PY3 get rid of this once we port
+    __nonzero__ = __bool__
 
     def __getitem__(self, x):
         return self.actorValue[0] if x == 0 else self.actorValue[1]
@@ -1221,8 +1225,10 @@ def __eq__(self, other):
     def __ne__(self, other):
         return other[1] != self.mgefCode[1] or other[0] != self.mgefCode[0]
 
-    def __nonzero__(self):
+    def __bool__(self):
         return not isinstance(self.mgefCode, (MGEFCode.EmptyMGEFCode, MGEFCode.InvalidMGEFCode))
+    # PY3 get rid of this once we port
+    __nonzero__ = __bool__
 
     def __getitem__(self, x):
         return self.mgefCode[0] if x == 0 else self.mgefCode[1]