Moved classinstance into util

2 files changed, 1 insertions, 37 deletions

diff --git a/paste/wareweb/classinit.py b/paste/util/classinit.py
index 137f0d5..05156d5 100644
--- a/paste/wareweb/classinit.py
+++ b/paste/util/classinit.py
@@ -1,39 +1,3 @@
-class classinstancemethod(object):
-    """
-    Acts like a class method when called from a class, like an
-    instance method when called by an instance.  The method should
-    take two arguments, 'self' and 'cls'; one of these will be None
-    depending on how the method was called.
-    """
-
-    def __init__(self, func):
-        self.func = func
-
-    def __get__(self, obj, type=None):
-        return _methodwrapper(self.func, obj=obj, type=type)
-
-class _methodwrapper(object):
-
-    def __init__(self, func, obj, type):
-        self.func = func
-        self.obj = obj
-        self.type = type
-
-    def __call__(self, *args, **kw):
-        assert not kw.has_key('self') and not kw.has_key('cls'), (
-            "You cannot use 'self' or 'cls' arguments to a "
-            "classinstancemethod")
-        return self.func(*((self.obj, self.type) + args), **kw)
-
-    def __repr__(self):
-        if self.obj is None:
-            return ('<bound class method %s.%s>'
-                    % (self.type.__name__, self.func.func_name))
-        else:
-            return ('<bound method %s.%s of %r>'
-                    % (self.type.__name__, self.func.func_name, self.obj))
-
-
 class ClassInitMeta(type):
 
     def __new__(meta, class_name, bases, new_attrs):
diff --git a/paste/wareweb/servlet.py b/paste/wareweb/servlet.py
index 05ad872..f08b006 100644
--- a/paste/wareweb/servlet.py
+++ b/paste/wareweb/servlet.py
@@ -5,7 +5,7 @@ import time
 import timeinterval
 import cgifields
 import event
-import classinit
+from paste.util import classinit
 from UserDict import UserDict
 
 __all__ = ['Servlet']