resync with trunk

CHANGES.txt

 Changelog
 =========
 
-2.13.5 (unreleased)
+2.13.6 (unreleased)
 -------------------
 
 
+2.13.5 (2010-09-29)
+-------------------
+
+- Fixed unit tests that failed on 64bit Python on Windows machines.
+
 2.13.4 (2010-08-31)
 -------------------
 

setup.py

@@ -17,7 +17,7 @@ import os
 from setuptools import setup, find_packages, Extension
 
 setup(name='Acquisition',
-      version = '2.13.5dev',
+      version = '2.13.6dev',
       url='http://pypi.python.org/pypi/Acquisition',
       license='ZPL 2.1',
       description="Acquisition is a mechanism that allows objects to obtain "

src/Acquisition/tests.py

@@ -1840,7 +1840,7 @@ def test_proxying():
     >>> c[5:10]
     slicing...
     (5, 10)
-    >>> c[5:] == (5, sys.maxint)
+    >>> c[5:] == (5, sys.maxsize)
     slicing...
     True
 
@@ -1863,7 +1863,7 @@ def test_proxying():
     >>> i.c[5:10]
     slicing...
     (5, 10)
-    >>> i.c[5:] == (5, sys.maxint)
+    >>> i.c[5:] == (5, sys.maxsize)
     slicing...
     True
 
@@ -1904,7 +1904,7 @@ def test_proxying():
     >>> c[5:10]
     slicing...
     (5, 10)
-    >>> c[5:] == (5, sys.maxint)
+    >>> c[5:] == (5, sys.maxsize)
     slicing...
     True
 
@@ -1927,7 +1927,7 @@ def test_proxying():
     >>> i.c[5:10]
     slicing...
     (5, 10)
-    >>> i.c[5:] == (5, sys.maxint)
+    >>> i.c[5:] == (5, sys.maxsize)
     slicing...
     True