cgkit-commits Mailing List for Python Computer Graphics Kit

Revision: 247
          http://cgkit.svn.sourceforge.net/cgkit/?rev=247&view=rev
Author:   mbaas
Date:     2008-03-30 02:54:29 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
Bugfix: Unicode parameters have caused an exception.

Modified Paths:
--------------
    cgkit/trunk/cgkit/cri.py
    cgkit/trunk/cgkit/ri.py
    cgkit/trunk/changelog.txt

Modified: cgkit/trunk/cgkit/cri.py
===================================================================
--- cgkit/trunk/cgkit/cri.py	2008-03-30 09:53:05 UTC (rev 246)
+++ cgkit/trunk/cgkit/cri.py	2008-03-30 09:54:29 UTC (rev 247)
@@ -1402,7 +1402,7 @@
         """Return a list of the individual items in a (possibly nested) sequence.
         """
         res = []
-        ScalarTypes = [types.IntType, types.LongType, types.FloatType, types.StringType]
+        ScalarTypes = [types.IntType, types.LongType, types.FloatType, types.StringType, types.UnicodeType]
         for v in seq:
             vtype = type(v)
             # v=scalar?

Modified: cgkit/trunk/cgkit/ri.py
===================================================================
--- cgkit/trunk/cgkit/ri.py	2008-03-30 09:53:05 UTC (rev 246)
+++ cgkit/trunk/cgkit/ri.py	2008-03-30 09:54:29 UTC (rev 247)
@@ -2116,7 +2116,6 @@
     """
     res = []
     ScalarTypes = [types.IntType, types.LongType, types.FloatType]
-    StringType = types.StringType
     for v in seq:
         vtype = type(v)
         # v=scalar?
@@ -2126,7 +2125,7 @@
         elif isinstance(v, _vec3):
             res.extend([str(v.x), str(v.y), str(v.z)])
         # v=string?
-        elif vtype==StringType:
+        elif isinstance(v, basestring):
             res.append('"%s"'%v)
         # no scalar or string. Then it might be a sequence...
         else:
@@ -2256,7 +2255,7 @@
         except:
             pass
         # Convert value into the appropriate string representation
-        if type(value)==types.StringType:
+        if isinstance(value, basestring):
             value='["'+value+'"]'
 #        elif type(value)==types.ListType or type(value)==types.TupleType:
         elif isseq:

Modified: cgkit/trunk/changelog.txt
===================================================================
--- cgkit/trunk/changelog.txt	2008-03-30 09:53:05 UTC (rev 246)
+++ cgkit/trunk/changelog.txt	2008-03-30 09:54:29 UTC (rev 247)
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+Changes from cgkit-2.0.0alpha8 to cgkit-2.0.0alpha9:
+
+Bug fixes/enhancements:
+
+- ri/cri: Passing unicode strings in a parameter list has caused an exception.
+
+----------------------------------------------------------------------
 Changes from cgkit-2.0.0alpha7 to cgkit-2.0.0alpha8:
 
 New features:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 246
          http://cgkit.svn.sourceforge.net/cgkit/?rev=246&view=rev
Author:   mbaas
Date:     2008-03-30 02:53:05 -0700 (Sun, 30 Mar 2008)

Log Message:
-----------
Added a test for unicode parameters

Modified Paths:
--------------
    cgkit/trunk/unittests/data/riout_ref.rib
    cgkit/trunk/unittests/ritest.py

Modified: cgkit/trunk/unittests/data/riout_ref.rib
===================================================================
--- cgkit/trunk/unittests/data/riout_ref.rib	2008-02-24 21:59:54 UTC (rev 245)
+++ cgkit/trunk/unittests/data/riout_ref.rib	2008-03-30 09:53:05 UTC (rev 246)
@@ -4,6 +4,7 @@
 ErrorHandler "print"
 ErrorHandler "ignore"
 Option "searchpath" "shader" [ "&:shaders" ]
+Option "render" "string bucketorder" [ "horizontal" ]
 Format 800.0 600.0 1.0
 Display "out.tif" "framebuffer" "rgba" "integer [ 2.0 ] origin" [ 10.0 10.0 ]
 CropWindow 0.25 0.75 0.1 0.9

Modified: cgkit/trunk/unittests/ritest.py
===================================================================
--- cgkit/trunk/unittests/ritest.py	2008-02-24 21:59:54 UTC (rev 245)
+++ cgkit/trunk/unittests/ritest.py	2008-03-30 09:53:05 UTC (rev 246)
@@ -179,6 +179,7 @@
     ri.RiErrorHandler(ri.RiErrorIgnore)
     err = ri.RiLastError
     ri.RiOption("searchpath", "shader", "&:shaders")
+    ri.RiOption("render", "string bucketorder", u"horizontal")
     ri.RiFormat(800, 600, 1.0)
     ri.RiDisplay("out.tif", ri.RI_FRAMEBUFFER, ri.RI_RGBA, "integer[2] origin", [10,10])
     ri.RiCropWindow(0.25, 0.75, 0.1, 0.9)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.