Merge pull request #1 from zopefoundation/sylvain-update-toolkit-vers…

…ions

Sylvain update toolkit versions

.travis.yml

@@ -1,5 +1,6 @@
 language: python
 python:
+    - 2.6
     - 2.7
 install:
     - python bootstrap.py

CHANGES.txt

@@ -4,7 +4,7 @@ Changes
 1.8 (unreleased)
 ----------------
 
-- Nothing changed yet.
+- Update tests.
 
 
 1.7 (2015-06-11)

MANIFEST.in

@@ -1,2 +1,7 @@
-include *.txt *.py
-recursive-include src *.*
+global-include *.mo
+include *.txt
+include *.rst
+include bootstrap.py
+include buildout.cfg
+include .travis.yml
+recursive-include src *.py *.zcml

setup.py

@@ -1,6 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
+
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
@@ -14,7 +15,6 @@ def read(*rnames):
     'zope.app.appsetup',
     'zope.component',
     'zope.configuration',
-    'zope.location',
     'zope.testing',
     'grokcore.content',
     ]

src/grokcore/site/ftests/site/site.py

@@ -3,7 +3,7 @@
 grok.Container.
 
   >>> from zope import interface
-  >>> from zope.location.interfaces import IPossibleSite, ISite
+  >>> from zope.component.interfaces import IPossibleSite, ISite
   >>> manfred = Mammoth()
   >>> IPossibleSite.providedBy(manfred)
   True

src/grokcore/site/ftests/test_grok_functional.py

@@ -1,9 +1,9 @@
+import doctest
 import unittest
-import grokcore.site
-
 from pkg_resources import resource_listdir
-from zope.testing import doctest
+
 from zope.app.appsetup.testlayer import ZODBLayer
+import grokcore.site
 
 FunctionalLayer = ZODBLayer(grokcore.site)
 

src/grokcore/site/tests/test_grok.py

@@ -1,15 +1,18 @@
+import doctest
 import re
 import unittest
 from pkg_resources import resource_listdir
-from zope.testing import doctest, cleanup, renormalizing
+
+from zope.testing import cleanup, renormalizing
 import zope.component.eventtesting
 
 checker = renormalizing.RENormalizing([
     # str(Exception) has changed from Python 2.4 to 2.5 (due to
     # Exception now being a new-style class).  This changes the way
     # exceptions appear in traceback printouts.
-    (re.compile(r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
-     r'ConfigurationExecutionError: \1:')])
+    (re.compile(
+        r"ConfigurationExecutionError: <class '([\w.]+)'>:"),
+        r'ConfigurationExecutionError: \1:')])
 
 
 def setUpZope(test):
@@ -32,12 +35,12 @@ def suiteFromPackage(name):
             continue
 
         dottedname = 'grokcore.site.tests.%s.%s' % (name, filename[:-3])
-        test = doctest.DocTestSuite(dottedname,
-                                    setUp=setUpZope,
-                                    tearDown=cleanUpZope,
-                                    checker=checker,
-                                    optionflags=doctest.ELLIPSIS +
-                                    doctest.NORMALIZE_WHITESPACE)
+        test = doctest.DocTestSuite(
+            dottedname,
+            setUp=setUpZope,
+            tearDown=cleanUpZope,
+            checker=checker,
+            optionflags=doctest.ELLIPSIS + doctest.NORMALIZE_WHITESPACE)
 
         suite.addTest(test)
     return suite