[Python-modules-commits] r25910 - in packages/cherrypy3/trunk/debian (4 files)

[xnox at users.alioth.debian.org]

    Date: Friday, September 20, 2013 @ 19:33:28
  Author: xnox
Revision: 25910

* Team upload.
* Switch to "3.0 (quilt)" source, to actually apply patches.

Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
  packages/cherrypy3/trunk/debian/patches/02_compat.diff
  packages/cherrypy3/trunk/debian/source/format

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2013-09-20 19:23:25 UTC (rev 25909)
+++ packages/cherrypy3/trunk/debian/changelog	2013-09-20 19:33:28 UTC (rev 25910)
@@ -1,3 +1,10 @@
+cherrypy3 (3.2.2-4) unstable; urgency=low
+
+  * Team upload.
+  * Switch to "3.0 (quilt)" source, to actually apply patches.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com>  Fri, 20 Sep 2013 20:23:21 +0100
+
 cherrypy3 (3.2.2-3) unstable; urgency=low
 
   [ Jakub Wilk ]

Modified: packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2013-09-20 19:23:25 UTC (rev 25909)
+++ packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2013-09-20 19:33:28 UTC (rev 25910)
@@ -1,10 +1,8 @@
-Index: cherrypy3-3.2.0~rc1/cherrypy/lib/profiler.py
-===================================================================
---- cherrypy3-3.2.0~rc1.orig/cherrypy/lib/profiler.py	2009-10-17 20:17:35.000000000 +0200
-+++ cherrypy3-3.2.0~rc1/cherrypy/lib/profiler.py	2010-02-22 01:08:27.928135547 +0100
-@@ -163,11 +163,14 @@
-             a single file. If False (the default), each HTTP request will
+--- a/cherrypy/lib/profiler.py
++++ b/cherrypy/lib/profiler.py
+@@ -166,11 +166,14 @@
              dump its profile data into a separate file.
+         
          """
 -        if profile is None or pstats is None:
 -            msg = ("Your installation of Python does not have a profile module. "

Modified: packages/cherrypy3/trunk/debian/patches/02_compat.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/02_compat.diff	2013-09-20 19:23:25 UTC (rev 25909)
+++ packages/cherrypy3/trunk/debian/patches/02_compat.diff	2013-09-20 19:33:28 UTC (rev 25910)
@@ -6,7 +6,6 @@
 # Parent  9820107d4ffb8058fd507888f90e28c695f6b4c0
 Timer class was renamed from _Timer to Timer in Python 3.3. This change adds a compatibility shim to detect this change and reference the base class accordingly. Fixes #1163.
 
-diff --git a/cherrypy/_cpcompat.py b/cherrypy/_cpcompat.py
 --- a/cherrypy/_cpcompat.py
 +++ b/cherrypy/_cpcompat.py
 @@ -18,6 +18,7 @@
@@ -17,7 +16,7 @@
  
  if sys.version_info >= (3, 0):
      py3k = True
-@@ -325,3 +326,9 @@
+@@ -316,3 +317,9 @@
      # Python 2
      def next(i):
          return i.next()
@@ -27,7 +26,6 @@
 +else:
 +    # Python 3.2 and earlier
 +    Timer = threading._Timer
-diff --git a/cherrypy/process/plugins.py b/cherrypy/process/plugins.py
 --- a/cherrypy/process/plugins.py
 +++ b/cherrypy/process/plugins.py
 @@ -7,7 +7,7 @@
@@ -46,5 +44,5 @@
 -class PerpetualTimer(threading._Timer):
 +class PerpetualTimer(Timer):
      """A responsive subclass of threading._Timer whose run() method repeats.
- 
+     
      Use this timer only when you really need a very interruptible timer;

Modified: packages/cherrypy3/trunk/debian/source/format
===================================================================
--- packages/cherrypy3/trunk/debian/source/format	2013-09-20 19:23:25 UTC (rev 25909)
+++ packages/cherrypy3/trunk/debian/source/format	2013-09-20 19:33:28 UTC (rev 25910)
@@ -1 +1 @@
-1.0
+3.0 (quilt)