Skip to content

Commit

Permalink
All tests pass
Browse files Browse the repository at this point in the history
  • Loading branch information
kedder committed Feb 28, 2013
1 parent 0ac6701 commit ea8fe0c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
2 changes: 1 addition & 1 deletion CHANGES.txt
Expand Up @@ -2,7 +2,7 @@
CHANGES
=======

4.0.0a1 (unreleased)
4.0.0a1 (2013-02-28)
--------------------

- Added support for Python 3.3.
Expand Down
2 changes: 0 additions & 2 deletions buildout.cfg
Expand Up @@ -4,8 +4,6 @@
# http://download.zope.org/zopetoolkit/index/1.1/ztk-versions.cfg
develop = .
find-links =
${buildout:directory}/zope.app.appsetup-4.0.0a1.dev.tar.gz
${buildout:directory}/zope.app.publication-4.0.0a1.dev.tar.gz
${buildout:directory}/zope.testbrowser-4.0.3dev.tar.gz
${buildout:directory}/ZODB-4.0.0dev.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Expand Up @@ -63,7 +63,7 @@
'zope.app.publication',
'zope.event',
'zope.interface',
'zope.publisher>=4.0.0a1',
'zope.publisher>=4.0.0a3',
'zope.security>4.0.0a2',
'zope.component',
'zope.configuration',
Expand Down
9 changes: 7 additions & 2 deletions src/zope/app/wsgi/__init__.py
Expand Up @@ -34,9 +34,9 @@
from zope.app.wsgi import interfaces


from zope.app.wsgi._compat import PYTHON3
from zope.app.wsgi._compat import PYTHON2

if PYTHON3:
if not PYTHON2:
basestring = (str, bytes)

@implementer(interfaces.IWSGIApplication)
Expand Down Expand Up @@ -71,6 +71,11 @@ def __call__(self, environ, start_response):
message = '-'
else:
message = logging_info.getLogMessage()

if not PYTHON2:
# In python 3, convert message bytes to native string
message = message.decode('latin1')

environ['wsgi.logging_info'] = message
if 'REMOTE_USER' not in environ:
environ['REMOTE_USER'] = message
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Expand Up @@ -14,6 +14,7 @@ deps =
zope.browserpage
zope.login
zope.password
zope.publisher >= 4.0.0a3
zope.principalregistry >=4.0.0a1
zope.securitypolicy >=4.0.0a1
zope.testing
Expand Down

0 comments on commit ea8fe0c

Please sign in to comment.