sync with trunk

CHANGES.txt

 Changelog
 =========
 
-2.13.3 (unreleased)
+2.13.5 (unreleased)
 -------------------
 
 
+2.13.4 (2010-08-31)
+-------------------
+
+- LP 623665: Fixed typo in Acquisition.h.
+
+2.13.3 (2010-04-19)
+-------------------
+
+- Use the doctest module from the standard library and no longer depend on
+  zope.testing.
+
 2.13.2 (2010-04-04)
 -------------------
 

setup.py

@@ -17,7 +17,7 @@ import os
 from setuptools import setup, find_packages, Extension
 
 setup(name='Acquisition',
-      version = '2.13.3dev',
+      version = '2.13.5dev',
       url='http://pypi.python.org/pypi/Acquisition',
       license='ZPL 2.1',
       description="Acquisition is a mechanism that allows objects to obtain "
@@ -36,7 +36,7 @@ setup(name='Acquisition',
                                            '_Acquisition.c')],
                              include_dirs=['include', 'src']),
                    ],
-      install_requires=['ExtensionClass', 'zope.interface', 'zope.testing'],
+      install_requires=['ExtensionClass', 'zope.interface'],
       include_package_data=True,
       zip_safe=False,
       )

src/Acquisition/Acquisition.h

@@ -33,7 +33,7 @@ typedef struct {
 
 #define aq_Acquire(obj, name, filter, extra, explicit, deflt, containment ) (AcquisitionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Acquire(obj, name, filter, extra, explicit, deflt, containment)))
 #define aq_acquire(obj, name) (AcquisitionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Acquire(obj, name, NULL, NULL, 1, NULL, 0)))
-#define aq_get(obj, name, deflt, containment) (AcquistionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Get(obj, name, deflt, containment)))
+#define aq_get(obj, name, deflt, containment) (AcquisitionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Get(obj, name, deflt, containment)))
 #define aq_isWrapper(obj)   (AcquisitionCAPI == NULL ? -1 : (AcquisitionCAPI->AQ_IsWrapper(obj)))
 #define aq_base(obj)   (AcquisitionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Base(obj)))
 #define aq_parent(obj) (AcquisitionCAPI == NULL ? NULL : (AcquisitionCAPI->AQ_Parent(obj)))

src/Acquisition/tests.py

@@ -2436,7 +2436,7 @@ def test___parent__parent__circles():
     """
 
 import unittest
-from zope.testing.doctest import DocTestSuite, DocFileSuite
+from doctest import DocTestSuite, DocFileSuite
 
 def test_suite():
     return unittest.TestSuite((