date:20120528

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #838978: Fixed TypeError in cache_detail ZMI view.

2012-05-28 Thread Hano Schlichting

Log message for revision 126512:
  LP #838978: Fixed TypeError in cache_detail ZMI view.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/App/CacheManager.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===
--- Zope/branches/2.13/doc/CHANGES.rst  2012-05-28 12:24:03 UTC (rev 126511)
+++ Zope/branches/2.13/doc/CHANGES.rst  2012-05-28 12:48:01 UTC (rev 126512)
@@ -8,6 +8,8 @@
 2.13.14 (unreleased)
 
 
+- LP #838978: Fixed TypeError in cache_detail ZMI view.
+
 - Cleanup lock and pid files if the process dies early in startup.
 
 - Added PubStart, PubBeforeCommit and PubAfterTraversal events to the

Modified: Zope/branches/2.13/src/App/CacheManager.py
===
--- Zope/branches/2.13/src/App/CacheManager.py  2012-05-28 12:24:03 UTC (rev 
126511)
+++ Zope/branches/2.13/src/App/CacheManager.py  2012-05-28 12:48:01 UTC (rev 
126512)
@@ -102,10 +102,10 @@
 if REQUEST is not None:
 # format as text
 REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain')
-return '\n'.join('%6d %s'%(count, name) for count, name in detail)
-else:
-# raw
-return detail
+return '\n'.join(
+['%6d %s' % (count, name) for name, count in detail])
+# raw
+return detail
 
 def cache_extreme_detail(self, REQUEST=None):
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/App/CacheManager.py Merge c126512 from 2.13 branch

2012-05-28 Thread Hano Schlichting

Log message for revision 126513:
  Merge c126512 from 2.13 branch
  

Changed:
  U   Zope/trunk/src/App/CacheManager.py

-=-
Modified: Zope/trunk/src/App/CacheManager.py
===
--- Zope/trunk/src/App/CacheManager.py  2012-05-28 12:48:01 UTC (rev 126512)
+++ Zope/trunk/src/App/CacheManager.py  2012-05-28 12:48:52 UTC (rev 126513)
@@ -97,10 +97,10 @@
 if REQUEST is not None:
 # format as text
 REQUEST.RESPONSE.setHeader('Content-Type', 'text/plain')
-return '\n'.join('%6d %s'%(count, name) for count, name in detail)
-else:
-# raw
-return detail
+return '\n'.join(
+['%6d %s' % (count, name) for name, count in detail])
+# raw
+return detail
 
 def cache_extreme_detail(self, REQUEST=None):
 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt Merge c126514 from 2.13 branch

2012-05-28 Thread Hano Schlichting

Log message for revision 126515:
  Merge c126514 from 2.13 branch
  

Changed:
  U   Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt

-=-
Modified: Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt
===
--- Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt  
2012-05-28 13:13:48 UTC (rev 126514)
+++ Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt  
2012-05-28 13:15:14 UTC (rev 126515)
@@ -24,13 +24,13 @@
  tal:loop tal:repeat=interface view/getInterfaceNames
  nbsp;nbsp;nbsp;nbsp;nbsp;
  label class=form-mono
-tal:content=interface/name i18n:translate=INTERFACE/labelbr /
+tal:content=interface/nameINTERFACE/labelbr /
  /tal:loop
  tal:loop tal:repeat=interface view/getDirectlyProvidedNames
  input type=checkbox id=INTERFACE name=remove:list
 tal:attributes=id interface/name; value interface/name /
  label class=form-mono for=INTERFACE tal:attributes=for interface/name
-tal:content=interface/name i18n:translate=INTERFACE/labelbr /
+tal:content=interface/nameINTERFACE/labelbr /
  /tal:loop
  tal:case tal:condition=view/getDirectlyProvidedNames
  div class=formControls FormButtons
@@ -47,7 +47,7 @@
  input type=checkbox id=INTERFACE name=add:list
 tal:attributes=id interface/name; value interface/name /
  label class=form-mono for=INTERFACE tal:attributes=for interface/name
-tal:content=interface/name i18n:translate=INTERFACE/labelbr /
+tal:content=interface/nameINTERFACE/labelbr /
  /tal:loop
  div class=formControls FormButtons
   input class=form-element type=submit name=SAVE value=Add

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #950689: Fix HTTPS detection under mod_wsgi.

2012-05-28 Thread Hano Schlichting

Log message for revision 126516:
  LP #950689: Fix HTTPS detection under mod_wsgi.
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/src/ZPublisher/HTTPRequest.py

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===
--- Zope/branches/2.13/doc/CHANGES.rst  2012-05-28 13:15:14 UTC (rev 126515)
+++ Zope/branches/2.13/doc/CHANGES.rst  2012-05-28 13:29:31 UTC (rev 126516)
@@ -8,6 +8,8 @@
 2.13.14 (unreleased)
 
 
+- LP #950689: Fix HTTPS detection under mod_wsgi.
+
 - LP #975039: Don't translate interface names in edit_markers ZMI view.
 
 - LP #838978: Fixed TypeError in cache_detail ZMI view.

Modified: Zope/branches/2.13/src/ZPublisher/HTTPRequest.py
===
--- Zope/branches/2.13/src/ZPublisher/HTTPRequest.py2012-05-28 13:15:14 UTC 
(rev 126515)
+++ Zope/branches/2.13/src/ZPublisher/HTTPRequest.py2012-05-28 13:29:31 UTC 
(rev 126516)
@@ -383,8 +383,8 @@
 if server_url is not None:
 other['SERVER_URL'] = server_url = server_url.strip()
 else:
-if 'HTTPS' in environ and (
-environ['HTTPS'] == on or environ['HTTPS'] == ON):
+https_environ = environ.get('HTTPS', False)
+if https_environ and https_environ in ('on', 'ON', '1'):
 protocol = 'https'
 elif ('SERVER_PORT_SECURE' in environ and
 environ['SERVER_PORT_SECURE'] == 1):

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/HTTPRequest.py Merge c126516 from 2.13 branch

2012-05-28 Thread Hano Schlichting

Log message for revision 126517:
  Merge c126516 from 2.13 branch
  

Changed:
  U   Zope/trunk/src/ZPublisher/HTTPRequest.py

-=-
Modified: Zope/trunk/src/ZPublisher/HTTPRequest.py
===
--- Zope/trunk/src/ZPublisher/HTTPRequest.py2012-05-28 13:29:31 UTC (rev 
126516)
+++ Zope/trunk/src/ZPublisher/HTTPRequest.py2012-05-28 13:30:50 UTC (rev 
126517)
@@ -381,8 +381,8 @@
 if server_url is not None:
 other['SERVER_URL'] = server_url = server_url.strip()
 else:
-if 'HTTPS' in environ and (
-environ['HTTPS'] == on or environ['HTTPS'] == ON):
+https_environ = environ.get('HTTPS', False)
+if https_environ and https_environ in ('on', 'ON', '1'):
 protocol = 'https'
 elif ('SERVER_PORT_SECURE' in environ and
 environ['SERVER_PORT_SECURE'] == 1):

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #838978: Fixed TypeError in cache_detail ZMI view.

[Zope-Checkins] SVN: Zope/trunk/src/App/CacheManager.py Merge c126512 from 2.13 branch

[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/utilities/browser/edit_markers.pt Merge c126514 from 2.13 branch

[Zope-Checkins] SVN: Zope/branches/2.13/ LP #950689: Fix HTTPS detection under mod_wsgi.

[Zope-Checkins] SVN: Zope/trunk/src/ZPublisher/HTTPRequest.py Merge c126516 from 2.13 branch

5 matches

Site Navigation

Mail list logo

Footer information