Merge pull request #1 from zopefoundation/resurrection-python3

Resurrection python3.

.gitignore

@@ -1,7 +1,11 @@
+src/*.egg-info
+parts
+develop-eggs
+dev
+bin
 *.pyc
+.tox
+.mr.developer.cfg
 .installed.cfg
+.coverage
 __pycache__
-bin
-develop-eggs
-parts
-src/*.egg-info

.travis.yml

@@ -1,10 +1,19 @@
 language: python
 python:
     - 2.7
+    - 3.4
+    - 3.5
+    - 3.6
+    - pypy
+    - pypy3
 install:
-    - python bootstrap.py
-    - bin/buildout
+    - pip install -U pip setuptools
+    - pip install -U zope.testrunner coverage coveralls
+    - pip install -U -e .[test]
 script:
-    - bin/test -v1
+    - coverage run -m zope.testrunner --test-path=src
+after_success:
+    - coveralls
 notifications:
     email: false
+cache: pip

CHANGES.txt

@@ -5,8 +5,7 @@ Changes
 1.4 (unreleased)
 ================
 
-- Nothing changed yet.
-
+- Python 3 compatibility.
 
 1.3 (2012-05-02)
 ================
@@ -28,4 +27,3 @@ Changes
 ================
 
 - Factor out form grok base package
-

MANIFEST.in

@@ -0,0 +1,6 @@
+include *.txt
+include *.rst
+include bootstrap.py
+include buildout.cfg
+include .travis.yml
+recursive-include src *.py *.zcml

buildout.cfg

@@ -1,7 +1,9 @@
 [buildout]
-extends = https://raw.github.com/zopefoundation/groktoolkit/master/grok.cfg
+extends =
+  https://raw.githubusercontent.com/zopefoundation/groktoolkit/resurrection-python3/grok.cfg
 develop = .
 parts =
+  omelette
   test
 
 [versions]
@@ -13,3 +15,9 @@ eggs =
   grokcore.rest
   grokcore.rest[test]
 defaults = ['--tests-pattern', '^f?tests$', '-v', '--auto-color']
+
+[omelette]
+recipe = collective.recipe.omelette
+eggs =
+  grokcore.rest
+  grokcore.rest[test]

setup.py

@@ -1,9 +1,11 @@
 from setuptools import setup, find_packages
 import os
 
+
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
 long_description = (
     read('README.txt')
     + '\n' +
@@ -13,16 +15,19 @@ def read(*rnames):
     '********\n'
     )
 
+
 tests_require = [
     'grokcore.content',
-    'grokcore.view [security_publication]',
-    'grokcore.view [test]',
+    'grokcore.view[security_publication]',
+    'grokcore.view[test]',
+    'six',
     'zope.app.appsetup',
     'zope.app.wsgi',
     'zope.errorview',
     'zope.testing',
     ]
 
+
 setup(
     name='grokcore.rest',
     version='1.4.dev0',
@@ -38,20 +43,29 @@ def read(*rnames):
         'Intended Audience :: Developers',
         'License :: OSI Approved :: Zope Public License',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
+        'Programming Language :: Python :: Implementation',
+        'Programming Language :: Python :: Implementation :: CPython',
+        'Programming Language :: Python :: Implementation :: PyPy',
         'Framework :: Zope3',
         ],
     packages=find_packages('src'),
-    package_dir = {'': 'src'},
+    package_dir={'': 'src'},
     namespace_packages=['grokcore'],
-    include_package_data = True,
+    include_package_data=True,
     zip_safe=False,
     install_requires=[
-        'setuptools',
         'grokcore.component >= 2.5dev',
         'grokcore.security',
+        'grokcore.traverser >= 3.0.0',
         'grokcore.view',
-        'grokcore.traverser',
         'martian',
+        'setuptools',
         'zope.component',
         'zope.interface',
         'zope.publisher >= 4.2.2',

src/grokcore/rest/components.py

@@ -25,9 +25,9 @@
 from grokcore.rest.interfaces import IREST
 
 
+@interface.implementer(IREST)
 class REST(zope.location.Location, ViewSupport):
     """Base class for REST views in Grok applications."""
-    interface.implements(IREST)
 
     def __init__(self, context, request):
         self.context = self.__parent__ = context

src/grokcore/rest/ftests/rest/localgrants.py

@@ -9,10 +9,12 @@
 For this model we have registered a REST GET view that's protected
 with a permission.  Therefore we can't access it as anonymous:
 
-  >>> print http_call('GET', '/++rest++mammoth/manfred')
+  >>> print(http_call(wsgi_app(), 'GET', '/++rest++mammoth/manfred HTTP/1.1'))
   Traceback (most recent call last):
   ...
-  Unauthorized: (<grokcore.rest.meta.MammothRest object at 0...>, '__call__', 'mammoth.Touch')
+  zope.security.interfaces.Unauthorized: \
+  (<grokcore.rest.meta.MammothRest object at 0...>, \
+  '__call__', 'mammoth.Touch')
 
 However, if we make a (local!) grant, e.g. on the root object, we can
 access the view just fine:
@@ -23,10 +25,10 @@
 
 With the grant in place we can access it as anonymous:
 
-  >>> print http('GET /++rest++mammoth/manfred HTTP/1.1')
+  >>> print(http(wsgi_app(), b'GET /++rest++mammoth/manfred HTTP/1.1'))
   HTTP/1.0 200 Ok
   Content-Length: 7
-  Content-Type: text/plain
+  Content-Type: text/plain;charset=utf-8
   <BLANKLINE>
   manfred