File cherrypy2.patch of Package python-cherrypy2

Index: CherryPy-2.3.0/setup.py
===================================================================
--- CherryPy-2.3.0.orig/setup.py	2008-01-14 03:20:11.000000000 +0100
+++ CherryPy-2.3.0/setup.py	2008-02-12 15:24:13.000000000 +0100
@@ -35,8 +35,8 @@ author_email="team@cherrypy.org"
 url="http://www.cherrypy.org"
 cp_license="BSD"
 packages=[
-    "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
-    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
+    "cherrypy2", "cherrypy2.lib", "cherrypy2.lib.filter",
+    "cherrypy2.tutorial", "cherrypy2.test", "cherrypy2.filters",
 ]
 download_url="http://download.cherrypy.org/cherrypy/2.3.0/"
 data_files=[
Index: CherryPy-2.3.0/cherrypy/__init__.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/__init__.py	2008-01-14 03:20:10.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/__init__.py	2008-02-12 15:24:13.000000000 +0100
@@ -25,7 +25,7 @@ codecoverage = False
 try:
     from threading import local
 except ImportError:
-    from cherrypy._cpthreadinglocal import local
+    from cherrypy2._cpthreadinglocal import local
 
 # Create a threadlocal object to hold the request and response
 # objects. In this way, we can easily dump those objects when
Index: CherryPy-2.3.0/cherrypy/_cpcgifs.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cpcgifs.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cpcgifs.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,5 +1,5 @@
 import cgi
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 class FieldStorage(cgi.FieldStorage):
Index: CherryPy-2.3.0/cherrypy/_cpengine.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cpengine.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cpengine.py	2008-02-12 15:25:37.000000000 +0100
@@ -7,9 +7,9 @@ import threading
 import time
 import warnings
 
-import cherrypy
-from cherrypy import _cphttptools, filters
-from cherrypy.lib import autoreload, cptools
+import cherrypy2 as cherrypy
+from cherrypy2 import _cphttptools, filters
+from cherrypy2.lib import autoreload, cptools
 
 # Use a flag to indicate the state of the application server.
 STOPPED = 0
@@ -65,7 +65,7 @@ class Engine(object):
                         raise err("'%s' is not a registered environment." % v)
         
         if cherrypy.codecoverage:
-            from cherrypy.lib import covercp
+            from cherrypy2.lib import covercp
             covercp.start()
         
         # If sessions are stored in files and we
@@ -180,7 +180,7 @@ class Engine(object):
         if threadID not in self.seen_threads:
             
             if cherrypy.codecoverage:
-                from cherrypy.lib import covercp
+                from cherrypy2.lib import covercp
                 covercp.start()
             
             i = len(self.seen_threads) + 1
Index: CherryPy-2.3.0/cherrypy/_cperror.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cperror.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cperror.py	2008-02-12 15:25:23.000000000 +0100
@@ -31,7 +31,7 @@ class InternalRedirect(Exception):
     """
     
     def __init__(self, path, params=None):
-        import cherrypy
+        import cherrypy2 as cherrypy
         import cgi
         request = cherrypy.request
         
@@ -73,7 +73,7 @@ class HTTPRedirect(Exception):
     """
     
     def __init__(self, urls, status=None):
-        import cherrypy
+        import cherrypy2 as cherrypy
         
         if isinstance(urls, basestring):
             urls = [urls]
@@ -106,7 +106,7 @@ class HTTPRedirect(Exception):
         Exception.__init__(self, abs_urls, status)
     
     def set_response(self):
-        import cherrypy
+        import cherrypy2 as cherrypy
         response = cherrypy.response
         response.status = status = self.status
         
@@ -168,7 +168,7 @@ class HTTPError(Error):
         Error.__init__(self, status, message)
     
     def set_response(self):
-        import cherrypy
+        import cherrypy2 as cherrypy
         handler = cherrypy._cputil.get_special_attribute("_cp_on_http_error", "_cpOnHTTPError")
         handler(self.status, self.message)
 
@@ -178,7 +178,7 @@ class NotFound(HTTPError):
     
     def __init__(self, path=None):
         if path is None:
-            import cherrypy
+            import cherrypy2 as cherrypy
             path = cherrypy.request.path
         self.args = (path,)
         HTTPError.__init__(self, 404, "The path %s was not found." % repr(path))
Index: CherryPy-2.3.0/cherrypy/_cphttptools.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cphttptools.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cphttptools.py	2008-02-12 15:25:48.000000000 +0100
@@ -6,10 +6,10 @@ import sys
 import time
 import types
 
-import cherrypy
-from cherrypy import _cputil, _cpcgifs
-from cherrypy.filters import applyFilters
-from cherrypy.lib import cptools, httptools, profiler
+import cherrypy2 as cherrypy
+from cherrypy2 import _cputil, _cpcgifs
+from cherrypy2.filters import applyFilters
+from cherrypy2.lib import cptools, httptools, profiler
 
 
 class Request(object):
Index: CherryPy-2.3.0/cherrypy/_cpserver.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cpserver.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cpserver.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,11 +3,11 @@
 import threading
 import time
 
-import cherrypy
-from cherrypy import _cphttptools
-from cherrypy.lib import cptools
+import cherrypy2 as cherrypy
+from cherrypy2 import _cphttptools
+from cherrypy2.lib import cptools
 
-from cherrypy._cpengine import Engine, STOPPED, STARTING, STARTED
+from cherrypy2._cpengine import Engine, STOPPED, STARTING, STARTED
 
 _missing = object()
 
Index: CherryPy-2.3.0/cherrypy/_cptree.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cptree.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cptree.py	2008-02-12 15:24:13.000000000 +0100
@@ -21,7 +21,7 @@ class Tree:
     def _get_mount_points(self):
         m = self._mount_points
         if "/" not in m:
-            import cherrypy
+            import cherrypy2 as cherrypy
             if cherrypy.root is not None and not isinstance(cherrypy.root, Root):
                 m["/"] = cherrypy.root
         return m
@@ -31,7 +31,7 @@ class Tree:
     
     def mount(self, app_root, baseurl=None, conf=None):
         """Mount the given app_root at the given baseurl (relative to root)."""
-        import cherrypy
+        import cherrypy2 as cherrypy
         
         if conf and not isinstance(conf, dict):
             conf = cherrypy.config.dict_from_config_file(conf)
@@ -77,7 +77,7 @@ class Tree:
         
         if path is None:
             try:
-                import cherrypy
+                import cherrypy2 as cherrypy
                 path = cherrypy.request.object_path
             except AttributeError:
                 return None
@@ -105,6 +105,6 @@ class Tree:
             if mount_point is None:
                 return path
         
-        from cherrypy.lib import httptools
+        from cherrypy2.lib import httptools
         return httptools.urljoin(mount_point, path)
 
Index: CherryPy-2.3.0/cherrypy/_cputil.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cputil.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cputil.py	2008-02-12 15:24:13.000000000 +0100
@@ -5,8 +5,8 @@ import datetime
 import sys
 import traceback
 
-import cherrypy
-from cherrypy.lib import httptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import httptools
 
 def get_object_trail(objectpath=None):
     """
Index: CherryPy-2.3.0/cherrypy/_cpwsgi.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/_cpwsgi.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/_cpwsgi.py	2008-02-12 15:26:07.000000000 +0100
@@ -6,9 +6,9 @@ except NameError:
     GeneratorExit = None
 
 import sys
-import cherrypy
-from cherrypy import _cputil, _cpwsgiserver, _cpwsgiserver3
-from cherrypy.lib import httptools
+import cherrypy2 as cherrypy
+from cherrypy2 import _cputil, _cpwsgiserver, _cpwsgiserver3
+from cherrypy2.lib import httptools
 
 
 def requestLine(environ):
Index: CherryPy-2.3.0/cherrypy/config.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/config.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/config.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,9 +3,9 @@
 import ConfigParser
 import os
 
-import cherrypy
-from cherrypy import _cputil
-from cherrypy.lib import autoreload, cptools, httptools
+import cherrypy2 as cherrypy
+from cherrypy2 import _cputil
+from cherrypy2.lib import autoreload, cptools, httptools
 
 
 # This configs dict holds the settings metadata for all cherrypy objects.
Index: CherryPy-2.3.0/cherrypy/filters/__init__.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/__init__.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/__init__.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,5 +1,5 @@
-import cherrypy
-from cherrypy import _cputil
+import cherrypy2 as cherrypy
+from cherrypy2 import _cputil
 
 
 # These are in order for a reason!
@@ -7,29 +7,29 @@ from cherrypy import _cputil
 # may be either a class, or the full package name of a class.
 
 input_filters = [
-    "cherrypy.filters.cachefilter.CacheFilter",
-    "cherrypy.filters.logdebuginfofilter.LogDebugInfoFilter",
-    "cherrypy.filters.baseurlfilter.BaseUrlFilter",
-    "cherrypy.filters.virtualhostfilter.VirtualHostFilter",
-    "cherrypy.filters.decodingfilter.DecodingFilter",
-    "cherrypy.filters.sessionfilter.SessionFilter",
-    "cherrypy.filters.sessionauthenticatefilter.SessionAuthenticateFilter",
-    "cherrypy.filters.staticfilter.StaticFilter",
-    "cherrypy.filters.nsgmlsfilter.NsgmlsFilter",
-    "cherrypy.filters.tidyfilter.TidyFilter",
-    "cherrypy.filters.xmlrpcfilter.XmlRpcFilter",
+    "cherrypy2.filters.cachefilter.CacheFilter",
+    "cherrypy2.filters.logdebuginfofilter.LogDebugInfoFilter",
+    "cherrypy2.filters.baseurlfilter.BaseUrlFilter",
+    "cherrypy2.filters.virtualhostfilter.VirtualHostFilter",
+    "cherrypy2.filters.decodingfilter.DecodingFilter",
+    "cherrypy2.filters.sessionfilter.SessionFilter",
+    "cherrypy2.filters.sessionauthenticatefilter.SessionAuthenticateFilter",
+    "cherrypy2.filters.staticfilter.StaticFilter",
+    "cherrypy2.filters.nsgmlsfilter.NsgmlsFilter",
+    "cherrypy2.filters.tidyfilter.TidyFilter",
+    "cherrypy2.filters.xmlrpcfilter.XmlRpcFilter",
 ]
 
 output_filters = [
-    "cherrypy.filters.responseheadersfilter.ResponseHeadersFilter",
-    "cherrypy.filters.xmlrpcfilter.XmlRpcFilter",
-    "cherrypy.filters.encodingfilter.EncodingFilter",
-    "cherrypy.filters.tidyfilter.TidyFilter",
-    "cherrypy.filters.nsgmlsfilter.NsgmlsFilter",
-    "cherrypy.filters.logdebuginfofilter.LogDebugInfoFilter",
-    "cherrypy.filters.gzipfilter.GzipFilter",
-    "cherrypy.filters.sessionfilter.SessionFilter",
-    "cherrypy.filters.cachefilter.CacheFilter",
+    "cherrypy2.filters.responseheadersfilter.ResponseHeadersFilter",
+    "cherrypy2.filters.xmlrpcfilter.XmlRpcFilter",
+    "cherrypy2.filters.encodingfilter.EncodingFilter",
+    "cherrypy2.filters.tidyfilter.TidyFilter",
+    "cherrypy2.filters.nsgmlsfilter.NsgmlsFilter",
+    "cherrypy2.filters.logdebuginfofilter.LogDebugInfoFilter",
+    "cherrypy2.filters.gzipfilter.GzipFilter",
+    "cherrypy2.filters.sessionfilter.SessionFilter",
+    "cherrypy2.filters.cachefilter.CacheFilter",
 ]
 
 _input_methods = ['on_start_resource', 'before_request_body', 'before_main']
@@ -54,7 +54,7 @@ backward_compatibility_dict = {
 
 def init():
     """Initialize the filters."""
-    from cherrypy.lib import cptools
+    from cherrypy2.lib import cptools
     
     instances = {}
     inputs, outputs = [], []
Index: CherryPy-2.3.0/cherrypy/filters/baseurlfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/baseurlfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/baseurlfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,4 +1,4 @@
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/cachefilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/cachefilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/cachefilter.py	2008-02-12 15:25:57.000000000 +0100
@@ -3,8 +3,8 @@ import Queue
 import threading
 import time
 
-import cherrypy
-from cherrypy.lib import httptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import httptools
 import basefilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/decodingfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/decodingfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/decodingfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,4 +1,4 @@
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 class DecodingFilter(BaseFilter):
Index: CherryPy-2.3.0/cherrypy/filters/encodingfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/encodingfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/encodingfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,4 +1,4 @@
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/gzipfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/gzipfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/gzipfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -2,7 +2,7 @@ import struct
 import time
 import zlib
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 class GzipFilter(BaseFilter):
Index: CherryPy-2.3.0/cherrypy/filters/logdebuginfofilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/logdebuginfofilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/logdebuginfofilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -5,7 +5,7 @@ try:
 except ImportError:
     import pickle
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/nsgmlsfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/nsgmlsfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/nsgmlsfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,6 +1,6 @@
 import os, cgi
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/responseheadersfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/responseheadersfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/responseheadersfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,4 +1,4 @@
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 class ResponseHeadersFilter(BaseFilter):
Index: CherryPy-2.3.0/cherrypy/filters/sessionauthenticatefilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/sessionauthenticatefilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/sessionauthenticatefilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,4 +1,4 @@
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/sessionfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/sessionfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/sessionfilter.py	2008-02-12 15:42:22.000000000 +0100
@@ -36,9 +36,9 @@ import thread
 import threading
 import types
 
-import cherrypy
+import cherrypy2 as cherrypy
 import basefilter
-from cherrypy.lib import httptools
+from cherrypy2.lib import httptools
 
 
 class EmptyClass:
Index: CherryPy-2.3.0/cherrypy/filters/staticfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/staticfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/staticfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,9 +1,9 @@
 import os
 import urllib
 
-import cherrypy
-from cherrypy.lib import cptools
-from cherrypy.filters.basefilter import BaseFilter
+import cherrypy2 as cherrypy
+from cherrypy2.lib import cptools
+from cherrypy2.filters.basefilter import BaseFilter
 
 
 class StaticFilter(BaseFilter):
Index: CherryPy-2.3.0/cherrypy/filters/tidyfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/tidyfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/tidyfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,7 +3,7 @@ import os
 import StringIO
 import traceback
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/virtualhostfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/virtualhostfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/virtualhostfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -15,7 +15,7 @@ but also to have  http://www.mydom1.com/
 their own right.
 """
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/filters/wsgiappfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/wsgiappfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/wsgiappfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -6,9 +6,9 @@ also see cherrypy.lib.cptools.WSGIApp"""
 
 import sys
 
-import cherrypy
-from cherrypy.filters.basefilter import BaseFilter
-from cherrypy._cputil import get_object_trail
+import cherrypy2 as cherrypy
+from cherrypy2.filters.basefilter import BaseFilter
+from cherrypy2._cputil import get_object_trail
 
 
 # is this sufficient for start_response?
Index: CherryPy-2.3.0/cherrypy/filters/xmlrpcfilter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/filters/xmlrpcfilter.py	2008-01-14 03:17:45.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/filters/xmlrpcfilter.py	2008-02-12 15:24:13.000000000 +0100
@@ -83,7 +83,7 @@
 import sys
 import xmlrpclib
 
-import cherrypy
+import cherrypy2 as cherrypy
 from basefilter import BaseFilter
 
 
Index: CherryPy-2.3.0/cherrypy/lib/covercp.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/covercp.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/lib/covercp.py	2008-02-12 15:24:13.000000000 +0100
@@ -41,7 +41,7 @@ except ImportError:
         pass
 
 # Guess initial depth to hide FIXME this doesn't work for non-cherrypy stuff
-import cherrypy
+import cherrypy2 as cherrypy
 initial_base = os.path.dirname(cherrypy.__file__)
 
 TEMPLATE_MENU = """<html>
@@ -343,7 +343,7 @@ def serve(path=localFile, port=8080):
         raise ImportError("The coverage module could not be imported.")
     coverage.cache_default = path
     
-    import cherrypy
+    import cherrypy2 as cherrypy
     cherrypy.root = CoverStats()
     cherrypy.config.update({'server.socket_port': port,
                             'server.thread_pool': 10,
Index: CherryPy-2.3.0/cherrypy/lib/cptools.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/cptools.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/lib/cptools.py	2008-02-12 15:24:13.000000000 +0100
@@ -13,10 +13,10 @@ import stat as _stat
 import sys
 import time
 
-import cherrypy
+import cherrypy2 as cherrypy
 import httptools
 
-from cherrypy.filters.wsgiappfilter import WSGIAppFilter
+from cherrypy2.filters.wsgiappfilter import WSGIAppFilter
 
 
 def decorate(func, decorator):
Index: CherryPy-2.3.0/cherrypy/lib/filter/__init__.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/filter/__init__.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/lib/filter/__init__.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import warnings
 warnings.warn("cherrypy.lib.filter has been superseded by cherrypy.filters and will be removed in CP 2.3", DeprecationWarning, stacklevel = 2)
 
-from cherrypy.filters import *
+from cherrypy2.filters import *
 
 import sys
 builtin_filters = ("basefilter", "baseurlfilter", "cachefilter",
Index: CherryPy-2.3.0/cherrypy/lib/form.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/form.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/lib/form.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,7 +3,7 @@
 import warnings
 warnings.warn("cherrypy.lib.form is deprecated and might disappear in future versions of CherryPy", DeprecationWarning, stacklevel = 2)
 
-import cherrypy
+import cherrypy2 as cherrypy
 import defaultformmask
 
 
Index: CherryPy-2.3.0/cherrypy/lib/profiler.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/lib/profiler.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/lib/profiler.py	2008-02-12 15:24:13.000000000 +0100
@@ -121,14 +121,14 @@ class Profiler(object):
     menu.exposed = True
     
     def report(self, filename):
-        import cherrypy
+        import cherrypy2 as cherrypy
         cherrypy.response.headers['Content-Type'] = 'text/plain'
         return self.stats(filename)
     report.exposed = True
 
 
 def serve(path=None, port=8080):
-    import cherrypy
+    import cherrypy2 as cherrypy
     cherrypy.root = Profiler(path)
     cherrypy.config.update({'server.socket_port': int(port),
                             'server.thread_pool': 10,
Index: CherryPy-2.3.0/cherrypy/test/benchmark.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/benchmark.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/benchmark.py	2008-02-12 15:24:13.000000000 +0100
@@ -30,8 +30,8 @@ import sys
 import time
 import traceback
 
-import cherrypy
-from cherrypy.lib import httptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import httptools
 
 
 AB_PATH = ""
Index: CherryPy-2.3.0/cherrypy/test/helper.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/helper.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/helper.py	2008-02-12 15:24:13.000000000 +0100
@@ -22,8 +22,8 @@ import re
 import sys
 import thread
 
-import cherrypy
-from cherrypy.lib import httptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import httptools
 import webtest
 
 
Index: CherryPy-2.3.0/cherrypy/test/modpy.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/modpy.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/modpy.py	2008-02-12 15:24:13.000000000 +0100
@@ -96,7 +96,7 @@ def handler(req):
         options = req.get_options()
         testmod = options.get('testmod')
         m = __import__(('cherrypy.test.%s' % testmod), globals(), locals(), [''])
-        import cherrypy
+        import cherrypy2 as cherrypy
         cherrypy.config.update({
             "server.log_file": os.path.join(curdir, "test.log"),
             "server.environment": "production",
Index: CherryPy-2.3.0/cherrypy/test/standalone_test_alt_script_name.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/standalone_test_alt_script_name.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/standalone_test_alt_script_name.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,8 +1,8 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy._cpwsgi import wsgiApp, WSGIServer
+import cherrypy2 as cherrypy
+from cherrypy2._cpwsgi import wsgiApp, WSGIServer
 
 class Root:
     def index(self, name="world"):
Index: CherryPy-2.3.0/cherrypy/test/test.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test.py	2008-02-12 15:24:13.000000000 +0100
@@ -33,7 +33,7 @@ class TestHarness(object):
     
     def run(self, conf=None):
         """Run the test harness."""
-        import cherrypy
+        import cherrypy2 as cherrypy
         v = sys.version.split()[0]
         print "Python version used to run this test script:", v
         print "CherryPy version", cherrypy.__version__
@@ -190,7 +190,7 @@ class CommandLineParser(object):
             if c and os.path.exists(c):
                 os.remove(c)
             coverage.start()
-            import cherrypy
+            import cherrypy2 as cherrypy
             cherrypy.codecoverage = True
         except ImportError:
             coverage = None
@@ -198,7 +198,7 @@ class CommandLineParser(object):
     
     def stop_coverage(self):
         """Stop the coverage tool, save results, and report."""
-        import cherrypy
+        import cherrypy2 as cherrypy
         cherrypy.codecoverage = False
         if self.coverage:
             self.coverage.save()
Index: CherryPy-2.3.0/cherrypy/test/test_baseurl_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_baseurl_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_baseurl_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_cache_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_cache_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_cache_filter.py	2008-02-12 15:25:06.000000000 +0100
@@ -1,9 +1,9 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy.filters.cachefilter import expires
-from cherrypy.lib.httptools import HTTPDate
+import cherrypy2 as cherrypy
+from cherrypy2.filters.cachefilter import expires
+from cherrypy2.lib.httptools import HTTPDate
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_combinedfilters.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_combinedfilters.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_combinedfilters.py	2008-02-12 15:24:13.000000000 +0100
@@ -2,7 +2,7 @@ import test
 test.prefer_parent_path()
 
 import gzip, StringIO
-import cherrypy
+import cherrypy2 as cherrypy
 
 europoundUnicode = u'\x80\xa3'
 
Index: CherryPy-2.3.0/cherrypy/test/test_config.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_config.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_config.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,7 +3,7 @@ import test
 test.prefer_parent_path()
 
 import StringIO
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_core.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_core.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_core.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,8 +3,8 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy.lib import cptools, httptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import cptools, httptools
 import types
 
 import os
Index: CherryPy-2.3.0/cherrypy/test/test_custom_filters.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_custom_filters.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_custom_filters.py	2008-02-12 15:24:13.000000000 +0100
@@ -5,9 +5,9 @@ import types
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy import filters
-from cherrypy.filters.basefilter import BaseFilter
+import cherrypy2 as cherrypy
+from cherrypy2 import filters
+from cherrypy2.filters.basefilter import BaseFilter
 
 
 class AccessFilter(BaseFilter):
Index: CherryPy-2.3.0/cherrypy/test/test_decodingencoding_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_decodingencoding_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_decodingencoding_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 europoundUnicode = u'\x80\xa3'
 sing = u"\u6bdb\u6cfd\u4e1c: Sing, Little Birdie?"
 sing8 = sing.encode('utf-8')
Index: CherryPy-2.3.0/cherrypy/test/test_gzip_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_gzip_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_gzip_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -2,7 +2,7 @@ import test
 test.prefer_parent_path()
 
 import gzip, StringIO
-import cherrypy
+import cherrypy2 as cherrypy
 
 def setup_server():
     class Root:
Index: CherryPy-2.3.0/cherrypy/test/test_http.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_http.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_http.py	2008-02-12 15:24:13.000000000 +0100
@@ -11,8 +11,8 @@ test.prefer_parent_path()
 import gc
 import httplib
 import threading
-import cherrypy
-from cherrypy import _cphttptools
+import cherrypy2 as cherrypy
+from cherrypy2 import _cphttptools
 
 
 data = object()
Index: CherryPy-2.3.0/cherrypy/test/test_logdebuginfo_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_logdebuginfo_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_logdebuginfo_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_noserver.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_noserver.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_noserver.py	2008-02-12 15:24:13.000000000 +0100
@@ -14,8 +14,8 @@ PythonOption application cherrypy._cpwsg
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy import _cpwsgi
+import cherrypy2 as cherrypy
+from cherrypy2 import _cpwsgi
 
 class HelloWorld:
     def index(self):
Index: CherryPy-2.3.0/cherrypy/test/test_objectmapping.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_objectmapping.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_objectmapping.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 mount_points = ["/", "/users/fred/blog", "/corp/blog"]
Index: CherryPy-2.3.0/cherrypy/test/test_response_headers_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_response_headers_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_response_headers_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,8 +1,8 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
-from cherrypy._cputil import headers
+import cherrypy2 as cherrypy
+from cherrypy2._cputil import headers
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_session_concurrency.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_session_concurrency.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_session_concurrency.py	2008-02-12 15:24:13.000000000 +0100
@@ -5,7 +5,7 @@ It then checks that the integrity of the
 
 """
 
-import cherrypy
+import cherrypy2 as cherrypy
 import httplib
 import sys
 import thread
Index: CherryPy-2.3.0/cherrypy/test/test_session_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_session_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_session_filter.py	2008-02-12 15:24:55.000000000 +0100
@@ -1,7 +1,8 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy, os, time
+import cherrypy2 as cherrypy
+import os, time
 from cherrypy.filters import sessionfilter
 
 localDir = os.path.dirname(__file__)
Index: CherryPy-2.3.0/cherrypy/test/test_sessionauthenticate_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_sessionauthenticate_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_sessionauthenticate_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -1,7 +1,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 def setup_server():
     class Test:
Index: CherryPy-2.3.0/cherrypy/test/test_states.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_states.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_states.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,7 +3,7 @@ test.prefer_parent_path()
 
 import threading
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 
 class Root:
Index: CherryPy-2.3.0/cherrypy/test/test_static_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_static_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_static_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -5,8 +5,8 @@ import os
 curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
 import threading
 
-import cherrypy
-from cherrypy.lib import cptools
+import cherrypy2 as cherrypy
+from cherrypy2.lib import cptools
 
 
 def setup_server():
Index: CherryPy-2.3.0/cherrypy/test/test_tutorials.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_tutorials.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_tutorials.py	2008-02-12 15:24:13.000000000 +0100
@@ -3,7 +3,7 @@ test.prefer_parent_path()
 
 import sys
 
-import cherrypy
+import cherrypy2 as cherrypy
 import helper
 
 
Index: CherryPy-2.3.0/cherrypy/test/test_virtualhost_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_virtualhost_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_virtualhost_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -2,7 +2,7 @@
 import test
 test.prefer_parent_path()
 
-import cherrypy
+import cherrypy2 as cherrypy
 
 def setup_server():
     class Root:
Index: CherryPy-2.3.0/cherrypy/test/test_wsgiapp_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_wsgiapp_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_wsgiapp_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -6,9 +6,9 @@ def setup_server():
     import os
     curdir = os.path.join(os.getcwd(), os.path.dirname(__file__))
 
-    import cherrypy
-    from cherrypy.filters.wsgiappfilter import WSGIAppFilter
-    from cherrypy.lib.cptools import WSGIApp
+    import cherrypy2 as cherrypy
+    from cherrypy2.filters.wsgiappfilter import WSGIAppFilter
+    from cherrypy2.lib.cptools import WSGIApp
 
     def test_app(environ, start_response):
         status = '200 OK'
Index: CherryPy-2.3.0/cherrypy/test/test_xmlrpc_filter.py
===================================================================
--- CherryPy-2.3.0.orig/cherrypy/test/test_xmlrpc_filter.py	2008-01-14 03:17:44.000000000 +0100
+++ CherryPy-2.3.0/cherrypy/test/test_xmlrpc_filter.py	2008-02-12 15:24:13.000000000 +0100
@@ -4,7 +4,7 @@ import xmlrpclib
 
 
 def setup_server():
-    import cherrypy
+    import cherrypy2 as cherrypy
 
     class Root:
         def index(self):
openSUSE Build Service is sponsored by