Rev 143: merge a workaround for how some versions of pyrex do their casting. in http://bazaar.launchpad.net/~meliae-dev/meliae/trunk

[John Arbash Meinel]

At http://bazaar.launchpad.net/~meliae-dev/meliae/trunk

------------------------------------------------------------
revno: 143 [merge]
revision-id: john at arbash-meinel.com-20100630175131-wudoc6z6auonw8ro
parent: john at arbash-meinel.com-20100520155812-hccxcwfu9z8u4u5a
parent: john at arbash-meinel.com-20100630174819-o73s1wxzt6m42i58
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Wed 2010-06-30 12:51:31 -0500
message:
  merge a workaround for how some versions of pyrex do their casting.
modified:
  meliae/_intset.pyx             _intset.pyx-20090402034220-0rjrbrlgg8iuicjv-1
  meliae/tests/test__loader.py   test__loader.py-20090403201651-opywr80iv8lsqp76-1
-------------- next part --------------
=== modified file 'meliae/_intset.pyx'
--- a/meliae/_intset.pyx	2010-01-29 22:19:38 +0000
+++ b/meliae/_intset.pyx	2010-06-30 17:29:31 +0000
@@ -112,7 +112,9 @@
             perturb = perturb >> 5 # PERTURB_SHIFT
 
     def __contains__(self, val):
-        return self._contains(<int_type>val)
+        cdef int_type i_val
+        i_val = val
+        return self._contains(i_val)
 
     cdef object _contains(self, int_type c_val):
         cdef int_type *entry
@@ -220,10 +222,14 @@
     """
 
     def add(self, val):
-        self._add(<int_type>(<unsigned long>val))
+        cdef unsigned long ul_val
+        ul_val = val
+        self._add(<int_type>(ul_val))
 
     def __contains__(self, val):
-        return self._contains(<int_type>(<unsigned long>val))
+        cdef unsigned long ul_val
+        ul_val = val
+        return self._contains(<int_type>(ul_val))
 
     # TODO: Consider that the code would probably be simpler if we just
     # bit-shifted before passing the value to self._add and self._contains,

=== modified file 'meliae/tests/test__loader.py'
--- a/meliae/tests/test__loader.py	2010-01-08 22:51:33 +0000
+++ b/meliae/tests/test__loader.py	2010-06-30 17:48:19 +0000
@@ -14,6 +14,8 @@
 
 """Pyrex extension for tracking loaded objects"""
 
+import sys
+
 from meliae import (
     _loader,
     warn,
@@ -22,7 +24,7 @@
 
 
 class TestMemObjectCollection(tests.TestCase):
-    
+
     def test__init__(self):
         moc = _loader.MemObjectCollection()
         self.assertEqual(0, moc._active)
@@ -38,7 +40,6 @@
         self.assertEqual(933, moc._test_lookup(933))
         self.assertEqual(933, moc._test_lookup(933+1024))
         self.assertEqual(933, moc._test_lookup(933L+1024L))
-        self.assertEqual(933, moc._test_lookup(933L+2**32-1))
 
     def test__len__(self):
         moc = _loader.MemObjectCollection()