[Python-modules-commits] r12289 - in packages/cherrypy3/trunk/debian (2 files)

[jcfp-guest at users.alioth.debian.org]

    Date: Friday, March 19, 2010 @ 20:49:06
  Author: jcfp-guest
Revision: 12289

Updating 00_supress_profiler_warning.diff

Modified:
  packages/cherrypy3/trunk/debian/changelog
  packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff

Modified: packages/cherrypy3/trunk/debian/changelog
===================================================================
--- packages/cherrypy3/trunk/debian/changelog	2010-03-19 20:37:24 UTC (rev 12288)
+++ packages/cherrypy3/trunk/debian/changelog	2010-03-19 20:49:06 UTC (rev 12289)
@@ -3,6 +3,7 @@
   * New upstream release (Closes #571196).
   * Bumped Standards-Version to 3.8.4 (no changes needed).
   * Removing patch 02: no longer needed, incorporated upstream.
+  * Updating patch 00 to match release.
 
  -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>  Fri, 19 Mar 2010 21:15:58 +0100
 

Modified: packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff
===================================================================
--- packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2010-03-19 20:37:24 UTC (rev 12288)
+++ packages/cherrypy3/trunk/debian/patches/00_supress_profiler_warning.diff	2010-03-19 20:49:06 UTC (rev 12289)
@@ -1,24 +1,24 @@
---- a/cherrypy/lib/profiler.py.orig	2006-12-18 02:50:52.000000000 -0200
-+++ b/cherrypy/lib/profiler.py	2007-01-08 22:32:51.000000000 -0200
-@@ -50,12 +50,15 @@
- except ImportError:
-     profile = None
-     pstats = None
--    import warnings
--    msg = ("Your installation of Python does not have a profile module. "
--           "If you're on Debian, you can apt-get python2.4-profiler from "
--           "non-free in a separate step. See http://www.cherrypy.org/wiki/"
--           "ProfilingOnDebian for details.")
--    warnings.warn(msg)
-+    # do not advertise the non-free profiler everytime; its existence is
-+    # already documented at the README.Debian file
-+    #
-+    #import warnings
-+    #msg = ("Your installation of Python does not have a profile module. "
-+    #       "If you're on Debian, you can apt-get python2.4-profiler from "
-+    #       "non-free in a separate step. See http://www.cherrypy.org/wiki/"
-+    #       "ProfilingOnDebian for details.")
-+    #warnings.warn(msg)
- 
- import os, os.path
- import sys
+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
+             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. "
+-                   "If you're on Debian, try `sudo apt-get install python-profiler`. "
+-                   "See http://www.cherrypy.org/wiki/ProfilingOnDebian for details.")
+-            warnings.warn(msg)
++        # do not advertise the non-free profiler everytime; its existence is
++        # already documented at the README.Debian file
++        #
++        #if profile is None or pstats is None:
++        #    msg = ("Your installation of Python does not have a profile module. "
++        #           "If you're on Debian, try `sudo apt-get install python-profiler`. "
++        #           "See http://www.cherrypy.org/wiki/ProfilingOnDebian for details.")
++        #    warnings.warn(msg)
+         
+         self.nextapp = nextapp
+         self.aggregate = aggregate