Merge lp:~logan/ubuntu/raring/zope.app.wsgi/new-upstream into lp:ubuntu/raring/zope.app.wsgi

[Logan Rosen]

[Barry Warsaw (barry)]

Thanks for the contribution to Ubuntu! I will sponsor this into Raring.

review: Approve

[Logan Rosen (logan)]

Barry, any update on sponsoring this?

[Logan Rosen (logan)]

Oh, just kidding. Looks like the branch is just out-of-date due to a bzr error.

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2012-01-07 17:54:42 +0000
+++ CHANGES.txt	2012-11-03 20:14:19 +0000
@@ -2,6 +2,30 @@
 CHANGES
 =======
 
+3.15.0 (2012-01-19)
+-------------------
+
+- Fixed: zope.app.wsgi.paste.ZopeApplication didn't emit
+  ProcessStarting events.
+
+  **NOTE**
+    If an application compensated for this by generating the event, it
+    will need to stop or there will be multiple events
+    emited. (Whether or not multiple events will do any harm is
+    application specific.)
+
+3.14.0 (2012-01-10)
+-------------------
+
+- Set the WSGI environment's ``REMOTE_USER`` item (if not already set)
+  with the Zope principal label. (This is the same data set in
+  the ``wsgi.logging_info`` environment item.)
+
+  This change allows user info to be used by `paste.translogger
+  <http://pythonpaste.org/modules/translogger.html>`_ middleware (or
+  any similar middleware that uses ``REMOTE_USER``), which provides
+  access logging.
+
 
 3.13.0 (2011-03-15)
 -------------------

=== modified file 'PKG-INFO'
--- PKG-INFO	2012-01-07 17:54:42 +0000
+++ PKG-INFO	2012-11-03 20:14:19 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: zope.app.wsgi
-Version: 3.13.0
+Version: 3.15.0
 Summary: WSGI application for the zope.publisher
 Home-page: http://pypi.python.org/pypi/zope.app.wsgi
 Author: Zope Foundation and Contributors
@@ -36,6 +36,30 @@
         CHANGES
         =======
         
+        3.15.0 (2012-01-19)
+        -------------------
+        
+        - Fixed: zope.app.wsgi.paste.ZopeApplication didn't emit
+          ProcessStarting events.
+        
+          **NOTE**
+            If an application compensated for this by generating the event, it
+            will need to stop or there will be multiple events
+            emited. (Whether or not multiple events will do any harm is
+            application specific.)
+        
+        3.14.0 (2012-01-10)
+        -------------------
+        
+        - Set the WSGI environment's ``REMOTE_USER`` item (if not already set)
+          with the Zope principal label. (This is the same data set in
+          the ``wsgi.logging_info`` environment item.)
+        
+          This change allows user info to be used by `paste.translogger
+          <http://pythonpaste.org/modules/translogger.html>`_ middleware (or
+          any similar middleware that uses ``REMOTE_USER``), which provides
+          access logging.
+        
         
         3.13.0 (2011-03-15)
         -------------------

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-07 19:35:10 +0000
+++ debian/changelog	2012-11-03 20:14:19 +0000
@@ -1,3 +1,10 @@
+zope.app.wsgi (3.15.0-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Sat, 03 Nov 2012 16:08:43 -0400
+
 zope.app.wsgi (3.13.0-0ubuntu1) precise; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-06-28 04:41:01 +0000
+++ debian/control	2012-11-03 20:14:19 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Gediminas Paulauskas <[e-mail]>
 Build-Depends: debhelper (>= 7), python-all (>= 2.6.6-3~),
  python-setuptools (>= 0.6b3), python-van.pydeb (>= 1.3.0-4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 X-Python-Version: >= 2.5
 
 Package: python-zope.app.wsgi

=== modified file 'setup.py'
--- setup.py	2012-01-07 17:54:42 +0000
+++ setup.py	2012-11-03 20:14:19 +0000
@@ -18,12 +18,12 @@
 ##############################################################################
 """Setup for zope.app.wsgi package
 
-$Id: setup.py 120963 2011-03-15 22:52:10Z janjaapdriessen $
+$Id: setup.py 124091 2012-01-19 15:07:11Z jim $
 """
 from setuptools import setup, find_packages
 
 setup(name='zope.app.wsgi',
-      version='3.13.0',
+      version='3.15.0',
       url='http://pypi.python.org/pypi/zope.app.wsgi',
       license='ZPL 2.1',
       description='WSGI application for the zope.publisher',
@@ -48,12 +48,12 @@
           'zope.annotation',
           'zope.authentication',
           'zope.browserpage',
-          'zope.componentvocabulary',
-          'zope.location',
           'zope.login',
           'zope.password',
           'zope.principalregistry',
           'zope.securitypolicy',
+          'zope.testing',
+          'zope.traversing',
           ]),
       install_requires=[
           'setuptools',
@@ -72,6 +72,7 @@
           'zope.container',
           'zope.error',
           'zope.lifecycleevent',
+          'zope.processlifetime',
           'zope.session',
           'zope.site',
           'zope.testbrowser[wsgi] >= 4.0.0',

=== modified file 'src/zope.app.wsgi.egg-info/PKG-INFO'
--- src/zope.app.wsgi.egg-info/PKG-INFO	2012-01-07 17:54:42 +0000
+++ src/zope.app.wsgi.egg-info/PKG-INFO	2012-11-03 20:14:19 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: zope.app.wsgi
-Version: 3.13.0
+Version: 3.15.0
 Summary: WSGI application for the zope.publisher
 Home-page: http://pypi.python.org/pypi/zope.app.wsgi
 Author: Zope Foundation and Contributors
@@ -36,6 +36,30 @@
         CHANGES
         =======
         
+        3.15.0 (2012-01-19)
+        -------------------
+        
+        - Fixed: zope.app.wsgi.paste.ZopeApplication didn't emit
+          ProcessStarting events.
+        
+          **NOTE**
+            If an application compensated for this by generating the event, it
+            will need to stop or there will be multiple events
+            emited. (Whether or not multiple events will do any harm is
+            application specific.)
+        
+        3.14.0 (2012-01-10)
+        -------------------
+        
+        - Set the WSGI environment's ``REMOTE_USER`` item (if not already set)
+          with the Zope principal label. (This is the same data set in
+          the ``wsgi.logging_info`` environment item.)
+        
+          This change allows user info to be used by `paste.translogger
+          <http://pythonpaste.org/modules/translogger.html>`_ middleware (or
+          any similar middleware that uses ``REMOTE_USER``), which provides
+          access logging.
+        
         
         3.13.0 (2011-03-15)
         -------------------

=== modified file 'src/zope.app.wsgi.egg-info/requires.txt'
--- src/zope.app.wsgi.egg-info/requires.txt	2012-01-07 17:54:42 +0000
+++ src/zope.app.wsgi.egg-info/requires.txt	2012-11-03 20:14:19 +0000
@@ -14,6 +14,7 @@
 zope.container
 zope.error
 zope.lifecycleevent
+zope.processlifetime
 zope.session
 zope.site
 zope.testbrowser[wsgi] >= 4.0.0
@@ -24,9 +25,9 @@
 zope.annotation
 zope.authentication
 zope.browserpage
-zope.componentvocabulary
-zope.location
 zope.login
 zope.password
 zope.principalregistry
-zope.securitypolicy
\ No newline at end of file
+zope.securitypolicy
+zope.testing
+zope.traversing
\ No newline at end of file

=== modified file 'src/zope/app/wsgi/README.txt'
--- src/zope/app/wsgi/README.txt	2010-12-15 00:51:32 +0000
+++ src/zope/app/wsgi/README.txt	2012-11-03 20:14:19 +0000
@@ -104,9 +104,28 @@
 `ILoggingInfo`. Out-of-the-box, `zope.publisher` registers a base
 adapter that returns the principal id as value::
 
-  >>> print environ
-  {'wsgi.input': <cStringIO.StringI object at ...>,
-   'wsgi.logging_info': 'zope.anybody', 'PATH_INFO': '/'}
+  >>> from pprint import pprint
+  >>> pprint(environ)
+  {'PATH_INFO': '/',
+   'REMOTE_USER': 'zope.anybody',
+   'wsgi.input': <cStringIO.StringI object at ...>,
+   'wsgi.logging_info': 'zope.anybody'}
+
+.. edge case
+
+   If remote user is already set, don't update it:
+
+    >>> environ = {
+    ...     'PATH_INFO': '/',
+    ...     'REMOTE_USER': 'someoneelse',
+    ...     'wsgi.input': cStringIO.StringIO('')}
+
+    >>> _ = list(app(environ, start_response))
+    >>> pprint(environ)
+    {'PATH_INFO': '/',
+     'REMOTE_USER': 'someoneelse',
+     'wsgi.input': <cStringIO.StringI object at ...>,
+     'wsgi.logging_info': 'zope.anybody'}
 
 
 Creating A WSGI Application

=== modified file 'src/zope/app/wsgi/__init__.py'
--- src/zope/app/wsgi/__init__.py	2012-01-07 17:54:42 +0000
+++ src/zope/app/wsgi/__init__.py	2012-11-03 20:14:19 +0000
@@ -13,7 +13,7 @@
 ##############################################################################
 """A WSGI Application wrapper for zope
 
-$Id: __init__.py 119207 2010-12-28 19:49:21Z menesis $
+$Id: __init__.py 124018 2012-01-10 23:06:01Z jim $
 """
 import os
 import sys
@@ -65,6 +65,8 @@
         else:
             message = logging_info.getLogMessage()
         environ['wsgi.logging_info'] = message
+        if 'REMOTE_USER' not in environ:
+            environ['REMOTE_USER'] = message
 
         # Start the WSGI server response
         start_response(response.getStatusString(), response.getHeaders())

=== modified file 'src/zope/app/wsgi/paste.py'
--- src/zope/app/wsgi/paste.py	2012-01-07 17:54:42 +0000
+++ src/zope/app/wsgi/paste.py	2012-11-03 20:14:19 +0000
@@ -13,9 +13,11 @@
 ##############################################################################
 """An application factory for Paste
 
-$Id: paste.py 119207 2010-12-28 19:49:21Z menesis $
+$Id: paste.py 124089 2012-01-19 15:03:08Z jim $
 """
 from zope.app.wsgi import getWSGIApplication
+import zope.event
+import zope.processlifetime
 
 
 def asbool(obj):
@@ -30,4 +32,6 @@
 
 def ZopeApplication(global_config, config_file, handle_errors=True, **options):
     handle_errors = asbool(handle_errors)
-    return getWSGIApplication(config_file, handle_errors=handle_errors)
+    app = getWSGIApplication(config_file, handle_errors=handle_errors)
+    zope.event.notify(zope.processlifetime.ProcessStarting())
+    return app

=== modified file 'src/zope/app/wsgi/tests.py'
--- src/zope/app/wsgi/tests.py	2012-01-07 19:35:10 +0000
+++ src/zope/app/wsgi/tests.py	2012-11-03 20:14:19 +0000
@@ -26,6 +26,42 @@
 def cleanEvents(s):
     zope.event.subscribers.pop()
 
+def creating_app_w_paste_emits_ProcessStarting_event():
+    """
+    >>> import zope.event
+    >>> events = []
+    >>> subscriber = events.append
+    >>> zope.event.subscribers.append(subscriber)
+
+    >>> import os, tempfile
+    >>> temp_dir = tempfile.mkdtemp()
+    >>> sitezcml = os.path.join(temp_dir, 'site.zcml')
+    >>> open(sitezcml, 'w').write('<configure />')
+    >>> zopeconf = os.path.join(temp_dir, 'zope.conf')
+    >>> open(zopeconf, 'w').write('''
+    ... site-definition %s
+    ...
+    ... <zodb>
+    ...   <mappingstorage />
+    ... </zodb>
+    ...
+    ... <eventlog>
+    ...   <logfile>
+    ...     path STDOUT
+    ...   </logfile>
+    ... </eventlog>
+    ... ''' % sitezcml)
+
+    >>> import zope.app.wsgi.paste, zope.processlifetime
+    >>> app = zope.app.wsgi.paste.ZopeApplication(
+    ...     {}, zopeconf, handle_errors=False)
+
+    >>> len([e for e in events
+    ...     if isinstance(e, zope.processlifetime.ProcessStarting)]) == 1
+    True
+
+    >>> zope.event.subscribers.remove(subscriber)
+    """
 
 def test_suite():
 
@@ -36,6 +72,8 @@
         ])
     filereturns_suite = doctest.DocFileSuite('filereturns.txt')
     filereturns_suite.layer = BrowserLayer(zope.app.wsgi)
+    dt_suite = doctest.DocTestSuite()
+    dt_suite.layer = BrowserLayer(zope.app.wsgi)
 
     readme_test = doctest.DocFileSuite(
             'README.txt',
@@ -56,4 +94,6 @@
     testlayer_suite.layer = SillyMiddleWareBrowserLayer(zope.app.wsgi)
 
     return unittest.TestSuite((
-        filereturns_suite, readme_test, doctest_suite, testlayer_suite))
+        filereturns_suite, readme_test, doctest_suite, testlayer_suite,
+        dt_suite,
+        ))