utils.py: fix up isNonPrimitiveType for None
authorrobin
Thu, 17 Apr 2014 13:07:30 +0100
changeset 4076 777af896ef28
parent 4075 c1def2bb856f
child 4077 ac3fcb7cc6f4
utils.py: fix up isNonPrimitiveType for None
src/reportlab/__init__.py
src/reportlab/lib/utils.py
--- a/src/reportlab/__init__.py	Fri Apr 11 12:28:51 2014 +0100
+++ b/src/reportlab/__init__.py	Thu Apr 17 13:07:30 2014 +0100
@@ -3,7 +3,7 @@
 #history http://www.reportlab.co.uk/cgi-bin/viewcvs.cgi/public/reportlab/trunk/reportlab/__init__.py
 __version__=''' $Id$ '''
 __doc__="""The Reportlab PDF generation library."""
-Version = "3.1.6"
+Version = "3.1.7"
 
 import sys, os, imp
 
--- a/src/reportlab/lib/utils.py	Fri Apr 11 12:28:51 2014 +0100
+++ b/src/reportlab/lib/utils.py	Thu Apr 17 13:07:30 2014 +0100
@@ -42,6 +42,7 @@
 #isBytes for bytes strings only
 #isUnicode for proper unicode
 if isPy3:
+    _rl_NoneType=type(None)
     bytesT = bytes
     unicodeT = str
     strTypes = (str,bytes)
@@ -78,7 +79,7 @@
         return isinstance(v, type)
 
     def isNonPrimitiveInstance(x):
-        return not isinstance(x,(float,int,type,tuple,list,dict,str,bytes,complex,bool,slice,
+        return not isinstance(x,(float,int,type,tuple,list,dict,str,bytes,complex,bool,slice,_rl_NoneType,
             types.FunctionType,types.LambdaType,types.CodeType,
             types.MappingProxyType,types.SimpleNamespace,
             types.GeneratorType,types.MethodType,types.BuiltinFunctionType,
@@ -178,7 +179,7 @@
         return isinstance(v,(types.ClassType,type))
 
     def isNonPrimitiveInstance(x):
-        return isinstance(x,types.InstanceType) or not isinstance(x,(float,int,long,type,tuple,list,dict,bool,unicode,str,buffer,complex,slice,
+        return isinstance(x,types.InstanceType) or not isinstance(x,(float,int,long,type,tuple,list,dict,bool,unicode,str,buffer,complex,slice,types.NoneType,
                     types.FunctionType,types.LambdaType,types.CodeType,types.GeneratorType,
                     types.ClassType,types.UnboundMethodType,types.MethodType,types.BuiltinFunctionType,
                     types.BuiltinMethodType,types.ModuleType,types.FileType,types.XRangeType,