PyVRML97 2.3.1__tar.gz → 2.3.4b1__tar.gz

pyvrml97-2.3.4b1/PKG-INFO

@@ -0,0 +1,65 @@
+Metadata-Version: 2.4
+Name: PyVRML97
+Version: 2.3.4b1
+Summary: VRML97 Scenegraph model for Python
+Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
+License: BSD-style, see license.txt for details
+Project-URL: Homepage, http://pyopengl.sourceforge.net/context/
+Keywords: VRML,VRML97,scenegraph
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: C
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+Requires-Dist: numpy
+Requires-Dist: PyDispatcher
+Requires-Dist: simpleparse
+
+PyVRML97 Scenegraph Model
+==========================
+
+PyVRML97 is the scenegraph model from `OpenGLContext`_ but can be used separately
+in VRML97 processing tools. It relies on `SimpleParse`_, `PyDispatcher`_ and `Numpy`_
+to provide the basic modelling functionality.
+
+Properties (fields) in PyVRML97 follow the "Observer" pattern, and PyVRML97 
+provides a cache mechanism that allows you to do cache invalidation when 
+setting properties (fields). OpenGLContext uses that extensively to 
+optimize the rendering process.
+
+.. _`OpenGLContext`: https://pypi.python.org/pypi/OpenGLContext
+.. _`SimpleParse`: https://pypi.python.org/pypi/SimpleParse
+.. _`PyDispatcher`: https://pypi.python.org/pypi/PyDispatcher
+.. _`Numpy`: https://pypi.python.org/pypi/numpy
+
+Installation
+-------------
+
+It isn't common to directly install PyVRML97 itself (normally you want to 
+install it as part of installing OpenGLContext), but should you wish to, you
+can install via::
+
+    $ pip install PyVRML97 PyVRML97_accelerate
+
+The PyVRML97_accelerate module requires that you have a working compiler
+(or, if you are on Windows, prebuilt wheels likely are available).
+
+.. image:: https://ci.appveyor.com/api/projects/status/MikeCFletcher/pyvrml97/branch/master
+    :target: https://ci.appveyor.com/project/MikeCFletcher/pyvrml97
+    :alt: Appveyor Build
+
+.. image:: https://img.shields.io/pypi/v/pyvrml97.svg
+    :target: https://pypi.python.org/pypi/pyvrml97
+    :alt: Latest PyPI Version
+
+.. image:: https://img.shields.io/pypi/dm/pyvrml97.svg
+    :target: https://pypi.python.org/pypi/pyvrml97
+    :alt: Monthly download counter
+
+Build/Release Process 
+----------------------
+
+* Push an annotated tag with `version` prefix (github workflow `build_and_publish.yml`)

pyvrml97-2.3.4b1/PyVRML97.egg-info/PKG-INFO

@@ -0,0 +1,65 @@
+Metadata-Version: 2.4
+Name: PyVRML97
+Version: 2.3.4b1
+Summary: VRML97 Scenegraph model for Python
+Author-email: "Mike C. Fletcher" <mcfletch@vrplumber.com>
+License: BSD-style, see license.txt for details
+Project-URL: Homepage, http://pyopengl.sourceforge.net/context/
+Keywords: VRML,VRML97,scenegraph
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: C
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Multimedia :: Graphics :: 3D Rendering
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.9
+Description-Content-Type: text/x-rst
+Requires-Dist: numpy
+Requires-Dist: PyDispatcher
+Requires-Dist: simpleparse
+
+PyVRML97 Scenegraph Model
+==========================
+
+PyVRML97 is the scenegraph model from `OpenGLContext`_ but can be used separately
+in VRML97 processing tools. It relies on `SimpleParse`_, `PyDispatcher`_ and `Numpy`_
+to provide the basic modelling functionality.
+
+Properties (fields) in PyVRML97 follow the "Observer" pattern, and PyVRML97 
+provides a cache mechanism that allows you to do cache invalidation when 
+setting properties (fields). OpenGLContext uses that extensively to 
+optimize the rendering process.
+
+.. _`OpenGLContext`: https://pypi.python.org/pypi/OpenGLContext
+.. _`SimpleParse`: https://pypi.python.org/pypi/SimpleParse
+.. _`PyDispatcher`: https://pypi.python.org/pypi/PyDispatcher
+.. _`Numpy`: https://pypi.python.org/pypi/numpy
+
+Installation
+-------------
+
+It isn't common to directly install PyVRML97 itself (normally you want to 
+install it as part of installing OpenGLContext), but should you wish to, you
+can install via::
+
+    $ pip install PyVRML97 PyVRML97_accelerate
+
+The PyVRML97_accelerate module requires that you have a working compiler
+(or, if you are on Windows, prebuilt wheels likely are available).
+
+.. image:: https://ci.appveyor.com/api/projects/status/MikeCFletcher/pyvrml97/branch/master
+    :target: https://ci.appveyor.com/project/MikeCFletcher/pyvrml97
+    :alt: Appveyor Build
+
+.. image:: https://img.shields.io/pypi/v/pyvrml97.svg
+    :target: https://pypi.python.org/pypi/pyvrml97
+    :alt: Latest PyPI Version
+
+.. image:: https://img.shields.io/pypi/dm/pyvrml97.svg
+    :target: https://pypi.python.org/pypi/pyvrml97
+    :alt: Monthly download counter
+
+Build/Release Process 
+----------------------
+
+* Push an annotated tag with `version` prefix (github workflow `build_and_publish.yml`)

{PyVRML97-2.3.1 → pyvrml97-2.3.4b1}/PyVRML97.egg-info/SOURCES.txt

@@ -1,8 +1,8 @@
 MANIFEST.in
 README.rst
 license.txt
+pyproject.toml
 requirements.txt
-setup.py
 test-requirements.txt
 tox.ini
 PyVRML97.egg-info/PKG-INFO
@@ -11,6 +11,11 @@ PyVRML97.egg-info/dependency_links.txt
 PyVRML97.egg-info/not-zip-safe
 PyVRML97.egg-info/requires.txt
 PyVRML97.egg-info/top_level.txt
+tests/test_fieldtypes.py
+tests/test_nodepath.py
+tests/test_olist.py
+tests/test_tostring.py
+tests/test_transformmatrix.py
 vrml/__init__.py
 vrml/_bytes.py
 vrml/arrays.py

{PyVRML97-2.3.1 → pyvrml97-2.3.4b1}/README.rst

@@ -38,3 +38,8 @@ The PyVRML97_accelerate module requires that you have a working compiler
 .. image:: https://img.shields.io/pypi/dm/pyvrml97.svg
     :target: https://pypi.python.org/pypi/pyvrml97
     :alt: Monthly download counter
+
+Build/Release Process 
+----------------------
+
+* Push an annotated tag with `version` prefix (github workflow `build_and_publish.yml`)

pyvrml97-2.3.4b1/pyproject.toml

@@ -0,0 +1,48 @@
+[build-system]
+# PyVRML97 (the root package) is pure Python - no C extensions - so it needs
+# nothing but setuptools to build. Cython/numpy build-deps live only in
+# accelerate/pyproject.toml, where the extensions actually are. setuptools>=61
+# is required to read the PEP 621 [project] table below.
+requires = ["setuptools>=61.0"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "PyVRML97"
+dynamic = ["version"]
+description = "VRML97 Scenegraph model for Python"
+requires-python = ">=3.9"
+readme = "README.rst"
+license = { text = "BSD-style, see license.txt for details" }
+authors = [
+    { name = "Mike C. Fletcher", email = "mcfletch@vrplumber.com" },
+]
+dependencies = [
+    "numpy",
+    "PyDispatcher",
+    "simpleparse",
+]
+keywords = [
+    "VRML",
+    "VRML97",
+    "scenegraph",
+]
+classifiers = [
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python",
+    "Programming Language :: C",
+    "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Multimedia :: Graphics :: 3D Rendering",
+    "Intended Audience :: Developers",
+]
+
+[project.urls]
+Homepage = "http://pyopengl.sourceforge.net/context/"
+
+[tool.setuptools]
+zip-safe = false
+
+[tool.setuptools.packages.find]
+include = ["vrml*"]
+
+[tool.setuptools.dynamic]
+version = { attr = "vrml.__version__" }

pyvrml97-2.3.4b1/requirements.txt

@@ -0,0 +1,5 @@
+--prefer-binary 
+simpleparse
+numpy >= 2.0.1; python_version >= '3.10'
+numpy; python_version < '3.10'
+PyDispatcher

pyvrml97-2.3.4b1/test-requirements.txt

@@ -0,0 +1,4 @@
+-r ./requirements.txt
+pytest
+# pip crashing due to missing dataclasses, sigh
+dataclasses; python_version < '3.7'

pyvrml97-2.3.4b1/tests/test_fieldtypes.py

@@ -0,0 +1,20 @@
+import unittest,sys
+from vrml import fieldtypes
+from vrml.arrays import allclose,dot,array
+try:
+    xrange 
+except NameError:
+    xrange = range
+
+class TestFieldTypes( unittest.TestCase ):
+    def test_mfvec3f(self):
+        should_work = [
+            zip([1,2,3],[2,3,4],[5,6,7]),
+            map(int,[1,2,3]),
+            xrange(3),
+        ]
+        field = fieldtypes.MFVec3f(name="moo")
+        for value in should_work:
+            result = field.coerce(value),value 
+            
+        

pyvrml97-2.3.4b1/tests/test_nodepath.py

@@ -0,0 +1,80 @@
+import unittest
+from vrml.vrml97 import nodepath
+from vrml.vrml97.basenodes import Transform
+from vrml.arrays import allclose, array, pi,dot
+
+class TestNodePath( unittest.TestCase ):
+    def setUp( self ):
+        self.empty = nodepath.NodePath()
+        self.first_child = self.empty + [ Transform( translation=(1,0,0), DEF='first', ) ]
+        self.second_child = self.first_child + [ Transform( translation=(1,0,0), DEF='second') ]
+        self.third_child = self.second_child + [ Transform( translation=(3,0,0), scale=(2,1,2), rotation=(0,1,0,pi/2), DEF='third',)]
+        self.fourth_child = self.third_child + [ Transform( DEF='fourth',) ]
+    def test_empty_matrix( self ):
+        m = self.empty.transformMatrix()
+        assert allclose( 
+            m,
+            array([[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]],'f')
+        ), m
+    def test_second_child( self ):
+        m = self.second_child.transformMatrix()
+        assert allclose( 
+            m,
+            array([[1,0,0,0],[0,1,0,0],[0,0,1,0],[2,0,0,1]],'f')
+        ), m
+    def test_change_translation( self ):
+        self.first_child[-1].translation = (-1,0,0)
+        m2 = self.second_child.transformMatrix()
+        assert allclose( 
+            m2,
+            array([[1,0,0,0],[0,1,0,0],[0,0,1,0],[0,0,0,1]],'f')
+        ), m2
+    def test_change_rotation( self ):
+        self.first_child[-1].rotation = (0,1,0,3.14)
+        m = self.second_child.transformMatrix( translate=False, scale=False)
+        self.first_child[-1].rotation = (0,1,0,0.0)
+        m2 = self.second_child.transformMatrix( translate=False, scale=False)
+        assert not allclose( m,m2 ), (m,m2)
+    
+    def test_iterchildren( self ):
+        l = list( self.first_child.iterchildren())
+        assert l == [ self.second_child ]
+    def test_iterdescendents( self ):
+        l = list( self.empty.iterdescendents())
+        assert l == [ self.first_child, self.second_child ]
+    
+    def test_forward_back( self ):
+        for child in (self.second_child,self.third_child,self.fourth_child):
+            matrix = child.transformMatrix( )
+            inverse = child.transformMatrix( inverse=True )
+            test = array( [10,20,30,1], 'f')
+            projected = dot( matrix, test )
+            back = dot( inverse, projected )
+            assert allclose( test, back ), (test,back, child[-1], matrix, inverse)
+    def test_complex_transform( self ):
+        test = array( [0,0,10,1], 'f' )
+        matrix = self.fourth_child.transformMatrix( )
+        #inverse = self.fourth_child.transformMatrix( inverse=True )
+        projected = dot( test, matrix )
+        # projecting out of the screen, then rotated 
+        # counter-clockwise 90deg (to go right), then scaled up 2x (to 20)
+        # then translated 5 to the right...
+        target = array([25,0,0,1],'f')
+        assert allclose( projected, target, atol=0.0001), projected
+        
+    def test_nest_simple( self ):
+        path = self.empty + [ 
+            Transform( translation=(0,0,1), DEF='translate', ),
+            Transform( scale=(1,1,.5),DEF='scale'),
+        ]
+        matrix = path.transformMatrix()
+        projected = dot( array([0,0,10,1],'f'), matrix )
+        assert allclose( projected, array([0,0,6,1]),atol=.0001), projected
+   
+    def test_rotation_array( self ):
+        path = self.empty + [
+            Transform( rotation = (0,1,0,pi/2 )),
+        ]
+        matrix = path.transformMatrix()
+        projected = dot( array([ 0,0,1,1],'f'),matrix )
+        assert allclose( projected, array([1,0,0,1],'f'),atol=.0001), projected

pyvrml97-2.3.4b1/tests/test_olist.py

@@ -0,0 +1,43 @@
+import unittest
+from vrml import olist
+from pydispatch.dispatcher import connect
+
+class TestOList( unittest.TestCase ):
+    def setUp( self ):
+        self.out = []
+        self.olist = olist.OList()
+        connect( self.on_new, sender=self.olist )
+    def on_new( self, signal, value ):
+        self.out.append( (signal,value) )
+    def test_append( self ):
+        self.olist.append( 'this' )
+        assert self.out == [('new','this')], self.out
+    def test_setitem( self ):
+        self.olist[:] = [ 'those','them','their' ]
+        del self.out[:]
+        self.olist[1] = 'that'
+        assert self.out == [('del','them'),('new','that')], self.out
+    def test_pop( self ):
+        self.olist[:] = [ 'those','them','that' ]
+        del self.out[:]
+        popped = self.olist.pop( )
+        assert popped == 'that', popped
+        assert self.out == [('del','that')]
+    def test_insert( self ):
+        self.olist.insert( 0, 'those' )
+        assert self.out == [('new','those')]
+    def test_remove( self ):
+        self.olist[:] = [ 'those','them','their' ]
+        del self.out[:]
+        self.olist.remove( 'those' )
+        assert self.out == [('del','those')]
+    def test_delslice( self ):
+        self.olist[:] = [ 'those','them','their' ]
+        del self.out[:]
+        del self.olist[1:2]
+        assert self.out == [('del','them')], self.out
+    def test_setslice( self ):
+        self.olist[:] = [ 'those','them','their','thou' ]
+        del self.out[:]
+        self.olist[1:3] = ['them','those','that','them']
+        assert self.out == [('new','those'),('new','that'),('del','their')], self.out

pyvrml97-2.3.4b1/tests/test_tostring.py

@@ -0,0 +1,50 @@
+import unittest, os
+from vrml.vrml97.parser import buildParser
+from vrml.vrml97.basenodes import Transform
+from vrml.vrml97.shaders import (
+    ShaderGeometry,
+    Shader,
+    ShaderAttribute,
+    GLSLObject,
+    FloatUniform,  # not functional, but ok
+)
+from vrml.vrml97.scenegraph import SceneGraph
+import numpy as np
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+
+# to prevent issues if more than one file uses a .wrl or if they somehow use recursive inlines
+ALREADY_PROCESSED = []
+
+VRMLPARSER = buildParser()
+
+depth = 0
+
+
+class TestToString(unittest.TestCase):
+
+    def parsed_content(self, source):
+        parser = buildParser()
+        result = parser.parse(source)
+        success, result, parsed = result
+        if not success:
+            raise RuntimeError("Did not finish parse")
+        if parsed < len(source):
+            raise RuntimeError("Partial parse %d/%d characters" % (parsed, len(source)))
+        scene = result[1]
+        assert isinstance(scene, SceneGraph), scene
+        return scene
+
+    def test_to_string_simple(self):
+        source = open(os.path.join(HERE, 'fixtures', 'proto_is_simple.wrl')).read()
+        scene = self.parsed_content(source)
+        assert len(scene.children) == 1, scene.children
+        content = scene.toString()
+        assert 'PROTO' in content, content
+        assert 'X {' in content, content  # TODO: relies on default formatting...
+
+    def test_to_string_spec_file(self):
+        source = open(os.path.join(HERE, 'fixtures', 'exampleD.2.wrl')).read()
+        scene = self.parsed_content(source)
+        content = scene.toString()
+        assert 'Material' in content, content

pyvrml97-2.3.4b1/tests/test_transformmatrix.py

@@ -0,0 +1,85 @@
+import unittest,sys
+from vrml.arrays import pi,array
+from vrml.vrml97 import transformmatrix
+from vrml.arrays import allclose,dot
+DEGTORAD = transformmatrix.DEGTORAD
+try:
+    from vrml.vrml97 import _transformmatrix_accel
+except ImportError:
+    _transformmatrix_accel = None
+from vrml.vrml97 import _transformmatrix
+
+class TestTransformMatrix( unittest.TestCase ):
+    def test_calculations( self ):
+        for (matrix,point, expected, name) in self._create_test_matrix(
+            transformmatrix.transMatrix,
+            transformmatrix.rotMatrix,
+            transformmatrix.scaleMatrix,
+        ):
+            try:
+                result = dot( point,matrix)
+            except TypeError as err:
+                sys.stderr.write("""\nF (TypeError):\n\tpoint=%(point)s\n\t%(matrix)s\n"""%(locals()))
+            else:
+                assert allclose( result, expected, 0, 0.000001 ),(name,matrix,point,expected,result)
+    
+    def _create_test_matrix( self, transMatrix,rotMatrix,scaleMatrix ):
+        return [
+            (transMatrix( (1,0,0) )[0], (0, 0,0,1), (1,0,0,1), "Simple translation"),
+            (transMatrix( (-1,-1,-1) )[0], (1, 1,1,1), (0,0,0,1), "Simple translation"),
+            (transMatrix( (0,0,1) )[0], (0, 0,0,1), (0,0,1,1), "Simple translation"),
+            (rotMatrix( (0,1,0,pi) )[0], (1, 0,0,1), (-1,0,0,1), "Simple rotation"),
+            (rotMatrix( (0,1,0,pi/2) )[0], (1, 0,0,1), (0,0,-1,1), "Simple rotation"),
+            (rotMatrix( (0,0,1,pi/2) )[0], (1, 0,0,1), (0,1,0,1), "Simple rotation"),
+            (rotMatrix( (0,0,1,-(pi/2)) )[0], (1, 0,0,1), (0,-1,0,1), "Simple rotation"),
+            (rotMatrix( (0,0,-1,-(pi/2)) )[0], (1, 0,0,1), (0,1,0,1), "Simple rotation"),
+            (rotMatrix( (0,0,-2,-(pi/2)) )[0], (1, 0,0,1), (0,1,0,1), "Simple rotation (w/normalize)"),
+            (rotMatrix( (1,0,0,-(pi/2)) )[0], (1, 0,0,1), (1,0,0,1), "Simple rotation"),
+            (rotMatrix( (0,0,1,pi/2) )[0], (0,1,0,1), (-1,0,0,1), "Simple rotation"),
+            (rotMatrix( (1,0,0,pi/2) )[0], (0,0,1,1), (0,-1,0,1), "Simple rotation"),
+            (scaleMatrix( (1,1,2) )[0], (1, 1,1,1), (1,1,2,1), "Simple scale"),
+            (scaleMatrix( (-1,1,2) )[0], (1, 1,1,1), (-1,1,2,1), "Simple scale"),
+            (scaleMatrix( (-1,0,2) )[0], (1, 1,1,1), (-1,0,2,1), "Simple scale"),
+            (scaleMatrix( (-1,0,0) )[0], (1, 1,1,1), (-1,0,0,1), "Simple scale"),
+            (scaleMatrix( (0,0,0) )[0], (1, 1,1,1), (0,0,0,1), "Simple scale"),
+            (rotMatrix([ 0.,0.,1., -0.515])[0], (1,0,0,1), (0.87029272,-0.49253485,0.,1.), "Make sure rotation uses float check for abs value" ),
+        ]
+        
+    def test_perspectiveMatrix( self ):
+        """Test that perspective matrix calculation matches expected values"""
+        result = transformmatrix.perspectiveMatrix(
+            59.999999999999993*DEGTORAD, 1.0, 0.29999999999999999, 50000
+        )
+        inverse = transformmatrix.perspectiveMatrix(
+            59.999999999999993*DEGTORAD, 1.0, 0.29999999999999999, 50000, inverse=True,
+        )
+        
+        expected = array([
+            [ 1.73205081,  0.,          0.,          0.,        ],
+            [ 0.,          1.73205081,  0.,          0.,        ],
+            [ 0.,          0.,         -1.000012, -1.,        ],
+            [ 0.,          0.,         -0.6000036,   0.,        ],],'f')
+        assert allclose(result,expected), result
+        
+        test = array([ 20,8,5,1.0 ],'f')
+        projected = dot( result, test )
+        print(projected)
+        unprojected = dot( inverse, projected )
+        assert allclose( unprojected, test ), (unprojected, test)
+    
+    if _transformmatrix_accel:
+        def test_cross_check( self ):
+            first = self._create_test_matrix(
+                _transformmatrix_accel.transMatrix,
+                _transformmatrix_accel.rotMatrix,
+                _transformmatrix_accel.scaleMatrix,
+            )
+            second = self._create_test_matrix(
+                _transformmatrix.transMatrix,
+                _transformmatrix.rotMatrix,
+                _transformmatrix.scaleMatrix,
+            )
+            for (firstmatrix,_,_,_),(secondmatrix,point, _, name) in zip(first,second):
+                assert allclose(firstmatrix,secondmatrix, atol=0.000001), (firstmatrix,secondmatrix,name)
+
+

{PyVRML97-2.3.1 → pyvrml97-2.3.4b1}/tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist=py{27,36,37}-accel{0,1}
+envlist=py{312,311,310,38}-accel{0,1}
 skip_missing_interpreters=True
 [testenv]
 usedevelop=True

{PyVRML97-2.3.1 → pyvrml97-2.3.4b1}/vrml/__init__.py

@@ -17,6 +17,6 @@ standard.  For instance, the vrml.vrml97.basenodes
 file contains the "prototypes" for most of the
 built-in nodes in the official specification.
 """
-__version__ = "2.3.1"
+__version__ = "2.3.4b1"
 __author__ = "Michael Colin Fletcher"
 __license__ = "BSD-style, see license.txt for details"

{PyVRML97-2.3.1 → pyvrml97-2.3.4b1}/vrml/arrays.py

@@ -3,27 +3,30 @@
 Chooses numpy if available because when it's installed
 Numeric tends to be a bit flaky...
 """
+
 from numpy import *
+
 try:
-    # TODO: don't import this here, as it's not 
-    # actually *used* in pyvrml97, it's just used 
+    # TODO: don't import this here, as it's not
+    # actually *used* in pyvrml97, it's just used
     # in OpenGLContext...
     from vrml_accelerate import frustcullaccel
 except ImportError as err:
     frustcullaccel = None
 # why did this get taken out?  Is divide now safe?
-amin = amin 
+amin = amin
 amax = amax
-divide_safe = divide 
+divide_safe = divide
 # Now deal with differing numpy APIs...
-a = array([1,2,3],'i')
-ArrayType = ndarray # alias removed in later versions
-# Take's API changed from Numeric, we've updated to 
+a = array([1, 2, 3], 'i')
+ArrayType = ndarray  # alias removed in later versions
+# Take's API changed from Numeric, we've updated to
 # always provide axis now...
-if hasattr( a, '__array_typestr__' ):
-    def typeCode( a ):
+if hasattr(a, '__array_typestr__'):
+
+    def typeCode(a):
         """Retrieve the typecode for the given array
-        
+
         Depending on whether you access the classic or new API
         you have different access methods, so we have to use
         the typecode() method if __array_typestr__ isn't there.
@@ -32,10 +35,12 @@ if hasattr( a, '__array_typestr__' ):
             return a.__array_typestr__
         except AttributeError:
             return a.typecode()
+
 else:
-    def typeCode( a ):
+
+    def typeCode(a):
         """Retrieve the typecode for the given array
-        
+
         Depending on whether you access the classic or new API
         you have different access methods, so we have to use
         the typecode() method if .dtype.char isn't there.
@@ -44,24 +49,38 @@ else:
             return a.dtype.char
         except AttributeError:
             return a.typecode()
+
+
 del a
 implementation_name = 'numpy'
 try:
-    # PyVRML97 is from before numpy printed errors, we explicitly do not care 
+    # PyVRML97 is from before numpy printed errors, we explicitly do not care
     # about the divide-by-zero, which commonly happens in mesh data processing
-    # TODO: likely should rework the mesh processing to check manually and remove 
+    # TODO: likely should rework the mesh processing to check manually and remove
     # this sledge-hammer approach
     seterr(all='ignore')
 except Exception as err:
     pass
-    
-def safeCompare( first, second ):
+
+
+def safeCompare(first, second):
     """Watch out for pointless numpy truth-value checks"""
-    try:
-        return bool(first == second )
-    except ValueError:
-        return bool( any( first == second ) )
+    if first is None:
+        if second is None:
+            return True
+        else:
+            return False
+    elif second is None:
+        return False
+    if isinstance(first, (int, float, str)):
+        return first == second
+    if isinstance(first, ArrayType) and isinstance(second, ArrayType):
+        return bool(any(first == second))
+    elif type(first) != type(second):
+        return False
+    return bool(first == second)
+
 
-def contiguous( a ):
+def contiguous(a):
     """Force to a contiguous array"""
-    return array( a, typeCode(a) )
+    return array(a, typeCode(a))