[Checkins] SVN: z3c.deadlockdebugger/trunk/ prep for release

[David Glick]

Log message for revision 106080:
  prep for release

Changed:
  A   z3c.deadlockdebugger/trunk/CHANGES.txt
  U   z3c.deadlockdebugger/trunk/README.txt
  U   z3c.deadlockdebugger/trunk/setup.py
  U   z3c.deadlockdebugger/trunk/z3c/deadlockdebugger/threads.py

-=-
Added: z3c.deadlockdebugger/trunk/CHANGES.txt
===================================================================
--- z3c.deadlockdebugger/trunk/CHANGES.txt	                        (rev 0)
+++ z3c.deadlockdebugger/trunk/CHANGES.txt	2009-11-29 01:24:42 UTC (rev 106080)
@@ -0,0 +1,17 @@
+Changelog
+=========
+
+0.2 (2009-11-28)
+----------------
+
+- Added conditional import of BrowserView for compatibility with Zope 2.9.
+  [davisagli]
+
+- Added ability to report request path from the Zope 3 publisher.
+  [Tiberiu Ichim, malthe]
+
+0.1 (2008-02-14)
+----------------
+
+- Initial release.
+  [malthe]


Property changes on: z3c.deadlockdebugger/trunk/CHANGES.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: z3c.deadlockdebugger/trunk/README.txt
===================================================================
--- z3c.deadlockdebugger/trunk/README.txt	2009-11-28 20:00:11 UTC (rev 106079)
+++ z3c.deadlockdebugger/trunk/README.txt	2009-11-29 01:24:42 UTC (rev 106080)
@@ -11,7 +11,6 @@
 
 Caution: You should not use this package in production.
 
-
 Credits
 -------
 

Modified: z3c.deadlockdebugger/trunk/setup.py
===================================================================
--- z3c.deadlockdebugger/trunk/setup.py	2009-11-28 20:00:11 UTC (rev 106079)
+++ z3c.deadlockdebugger/trunk/setup.py	2009-11-29 01:24:42 UTC (rev 106080)
@@ -1,12 +1,11 @@
 from setuptools import setup, find_packages
-import sys, os
 
-version = '0.1'
+version = '0.2'
 
 setup(name='z3c.deadlockdebugger',
       version=version,
       description="A thread debugger.",
-      long_description=open("README.txt").read(),
+      long_description=open("README.txt").read() + open("CHANGES.txt").read(),
       classifiers=[
         "Framework :: Plone",
         "Framework :: Zope2",

Modified: z3c.deadlockdebugger/trunk/z3c/deadlockdebugger/threads.py
===================================================================
--- z3c.deadlockdebugger/trunk/z3c/deadlockdebugger/threads.py	2009-11-28 20:00:11 UTC (rev 106079)
+++ z3c.deadlockdebugger/trunk/z3c/deadlockdebugger/threads.py	2009-11-29 01:24:42 UTC (rev 106080)
@@ -32,16 +32,17 @@
 
            #reqinfo += '\n\t ' + co.co_name + '\t ' + co.co_filename
 
-            if (co.co_name == 'publish' and
-               co.co_filename.endswith('publisher/publish.py')):
-                request = f.f_locals.get('request')
-                if request is not None:
-                    reqinfo += (request.get('REQUEST_METHOD', '') + ' ' +
-                               request.get('PATH_INFO', ''))
-                    qs = request.get('QUERY_STRING')
-                    if qs:
-                        reqinfo += '?'+qs
-                break
+            if co.co_name == 'publish':
+                if co.co_filename.endswith('/publisher/publish.py') or \
+                   co.co_filename.endswith('/ZPublisher/Publish.py'):
+                    request = f.f_locals.get('request')
+                    if request is not None:
+                        reqinfo += (request.get('REQUEST_METHOD', '') + ' ' +
+                                   request.get('PATH_INFO', ''))
+                        qs = request.get('QUERY_STRING')
+                        if qs:
+                            reqinfo += '?'+qs
+                    break
             f = f.f_back
         if reqinfo:
             reqinfo = " (%s)" % reqinfo