Merge branch '3.2.3-1'

michilu · michilu · commit 8158f61bd75f · 2012-09-19T13:46:09.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+MANIFEST
 build
 dist
 tags
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+------------------
+2012-09-19 3.2.3-1
+------------------
+
+- Fix import errors
+
 ----------------
 2012-09-18 3.2.3
 ----------------
diff --git a/functools32/__init__.py b/functools32/__init__.py
@@ -0,0 +1 @@
+from .functools32 import *
diff --git a/functools32/_dummy_thread32.py b/functools32/_dummy_thread32.py
diff --git a/functools32/functools32.py b/functools32/functools32.py
@@ -13,13 +13,13 @@
 
 from _functools import partial, reduce
 from collections import MutableMapping, namedtuple
-from reprlib32 import recursive_repr as _recursive_repr
+from .reprlib32 import recursive_repr as _recursive_repr
 from weakref import proxy as _proxy
 import sys as _sys
 try:
     from _thread import allocate_lock as Lock
 except:
-    from _dummy_thread32 import allocate_lock as Lock
+    from ._dummy_thread32 import allocate_lock as Lock
 
 ################################################################################
 ### OrderedDict
diff --git a/functools32/reprlib32.py b/functools32/reprlib32.py
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def main():
 
     setup(
       name='functools32',
-      version='3.2.3',
+      version='3.2.3-1',
       description='Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy.',
       long_description="""
 This is a backport of the functools standard library module from
@@ -23,7 +23,7 @@ def main():
       maintainer_email='djmchl@gmail.com',
       url='https://github.com/MiCHiLU/python-functools32',
 
-      py_modules=['functools32'],
+      packages=['functools32'],
     )
 
 
diff --git a/test_functools32.py b/test_functools32.py
@@ -6,7 +6,7 @@
 from weakref import proxy
 import pickle
 from random import choice
-from functools32 import OrderedDict
+from functools32.functools32 import OrderedDict
 
 @staticmethod
 def PythonPartial(func, *args, **keywords):
@@ -617,10 +617,10 @@ def fib(n):
         self.assertEqual([fib(n) for n in range(16)],
             [0, 1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89, 144, 233, 377, 610])
         self.assertEqual(fib.cache_info(),
-            functools._CacheInfo(hits=28, misses=16, maxsize=None, currsize=16))
+            functools.functools32._CacheInfo(hits=28, misses=16, maxsize=None, currsize=16))
         fib.cache_clear()
         self.assertEqual(fib.cache_info(),
-            functools._CacheInfo(hits=0, misses=0, maxsize=None, currsize=0))
+            functools.functools32._CacheInfo(hits=0, misses=0, maxsize=None, currsize=0))
 
     def test_lru_with_exceptions(self):
         # Verify that user_function exceptions get passed through without

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+MANIFEST`
`1`	`2`	`build`
`2`	`3`	`dist`
`3`	`4`	`tags`