Rev 2909: (John Arbash Meinel) Use __init__ instead of __new__ for future pyrex version compatibility in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2909
revision-id: pqm at pqm.ubuntu.com-20071015224423-kn8kb5xrc4pef7vu
parent: pqm at pqm.ubuntu.com-20071015090441-ud1o5gta7klf0nn8
parent: john at arbash-meinel.com-20071010211806-2j9rg6wzrqh7yy4u
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-10-15 23:44:23 +0100
message:
  (John Arbash Meinel) Use __init__ instead of __new__ for future pyrex version compatibility
modified:
  bzrlib/_dirstate_helpers_c.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
  bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
    ------------------------------------------------------------
    revno: 2904.2.1
    merged: john at arbash-meinel.com-20071010211806-2j9rg6wzrqh7yy4u
    parent: pqm at pqm.ubuntu.com-20071010085229-7x5al1tirr29mq0l
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: bzr.dev
    timestamp: Wed 2007-10-10 16:18:06 -0500
    message:
      Switch from __new__ to __init__ to avoid potential pyrex upgrade problems.
=== modified file 'bzrlib/_dirstate_helpers_c.pyx'
--- a/bzrlib/_dirstate_helpers_c.pyx	2007-10-09 03:35:33 +0000
+++ b/bzrlib/_dirstate_helpers_c.pyx	2007-10-10 21:18:06 +0000
@@ -478,7 +478,7 @@
     cdef char *cur_cstr # Pointer to the current record
     cdef char *next # Pointer to the end of this record
 
-    def __new__(self, text):
+    def __init__(self, text):
         self.text = text
         self.text_cstr = PyString_AsString(text)
         self.text_size = PyString_Size(text)

=== modified file 'bzrlib/_knit_load_data_c.pyx'
--- a/bzrlib/_knit_load_data_c.pyx	2007-07-05 19:39:28 +0000
+++ b/bzrlib/_knit_load_data_c.pyx	2007-10-10 21:18:06 +0000
@@ -86,7 +86,7 @@
 
     cdef int history_len
 
-    def __new__(self, kndx, fp):
+    def __init__(self, kndx, fp):
         self.kndx = kndx
         self.fp = fp