Merge pull request #4 from NextThought/use-py-proxy-base

Make PyContainedProxyBase inherit directly from AbstractPyProxyBase. 

.travis.yml

@@ -6,6 +6,7 @@ env:
     - TOXENV=pypy
     - TOXENV=py33
     - TOXENV=py34
+    - TOXENV=py27-pure-zodb
 install:
     - pip install tox
 script:

setup.py

@@ -73,6 +73,8 @@ install_requires = [
     'zope.size',
     'zope.traversing>=4.0.0a1',
     'zope.publisher',
+    'zope.proxy>=4.1.5',
+    'persistent>=4.1.0',
     'BTrees'
 ]
 if not is_pypy:

src/zope/container/tests/test_contained_zodb.py

@@ -62,7 +62,8 @@ def test_basic_persistent_w_non_persistent_proxied():
     >>> p2._p_changed
     0
     >>> p2._p_deactivate()
-    >>> p2._p_changed
+    >>> bool(p2._p_changed)
+    False
     >>> p2.__name__
     'test'
 
@@ -188,7 +189,7 @@ def test_proxy_cache_interaction():
     We've also accessed the root object. If we garbage-collect the
     cache:
 
-    >>> conn._cache.incrgc()
+    >>> _ = conn._cache.incrgc()
 
     Then the root object will still be active, because it was accessed
     recently:
@@ -204,7 +205,8 @@ def test_proxy_cache_interaction():
 
     But it's a ghost:
 
-    >>> conn.root()['p']._p_changed
+    >>> bool(conn.root()['p']._p_changed)
+    False
 
     If we deactivate the root object:
 

tox.ini

 [tox]
-envlist = py26,py27,pypy,py33,py34,docs
+envlist = py26,py27,pypy,py33,py34,py27-zodb,pypy-zodb,py27-pure-zodb,docs
 
 [testenv]
 commands = python setup.py -q test -q
@@ -23,6 +23,29 @@ deps =
     zope.testrunner
     zope.testing
 
+[testenv:py27-zodb]
+basepython =
+    python2.7
+deps =
+    {[testenv]deps}
+    ZODB
+
+[testenv:py27-pure-zodb]
+basepython =
+    python2.7
+setenv =
+    PURE_PYTHON = 1
+deps =
+    {[testenv]deps}
+    ZODB
+
+[testenv:pypy-zodb]
+basepython =
+    pypy
+deps =
+    {[testenv]deps}
+    ZODB
+
 [testenv:coverage]
 usedevelop = true
 basepython =
@@ -38,7 +61,7 @@ deps =
 [testenv:docs]
 basepython =
     python2.7
-commands = 
+commands =
     sphinx-build -b html -d docs/_build/doctrees docs docs/_build/html
     sphinx-build -b doctest -d docs/_build/doctrees docs docs/_build/doctest
 deps =