Rev 131: I don't know what changed, but for some reason intset suddenly cares about signed. in http://bazaar.launchpad.net/~meliae-dev/meliae/trunk

John Arbash Meinel john at arbash-meinel.com
Fri Jan 8 22:08:27 GMT 2010


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

------------------------------------------------------------
revno: 131
revision-id: john at arbash-meinel.com-20100108220815-bpbos2u9oe3569in
parent: john at arbash-meinel.com-20100104131505-5gy4w6naxl6zu6jo
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Fri 2010-01-08 16:08:15 -0600
message:
  I don't know what changed, but for some reason intset suddenly cares about signed.
  Also, we left some fprintf stuff around.
  
  Some small cleanups overall.
-------------- next part --------------
=== modified file 'meliae/_intset.pyx'
--- a/meliae/_intset.pyx	2009-09-18 17:00:34 +0000
+++ b/meliae/_intset.pyx	2010-01-08 22:08:15 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 # 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -25,7 +25,7 @@
     void memset(void *, int, size_t)
 
 
-ctypedef size_t int_type
+ctypedef Py_ssize_t int_type
 cdef int_type _singleton1, _singleton2
 # _singleton1 is the 'no value present' value
 # _singleton2 is the 'value deleted' value, which has us keep searching

=== modified file 'meliae/_loader.pyx'
--- a/meliae/_loader.pyx	2009-12-29 22:16:42 +0000
+++ b/meliae/_loader.pyx	2010-01-08 22:08:15 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Canonical Ltd
+# Copyright (C) 2009, 2010 Canonical Ltd
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -309,10 +309,10 @@
             if self._obj.proxy == <PyObject *>self:
                 # This object is going away, remove the reference
                 self._obj.proxy = NULL
-            else:
-                fprintf(stderr, "obj at address %x referenced"
-                    " a proxy that was not self\n",
-                    <int><object>self._obj.address)
+            # else:
+            #     fprintf(stderr, "obj at address %x referenced"
+            #         " a proxy that was not self\n",
+            #         <int><object>self._obj.address)
         if self._managed_obj != NULL:
             _free_mem_object(self._managed_obj)
             self._managed_obj = NULL



More information about the bazaar-commits mailing list