fix some imports

taxilian · Feb 18, 2011 · e2ac6c0 · e2ac6c0
1 parent f7ca0d5
commit e2ac6c0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/couchdbkit/client.py b/couchdbkit/client.py
@@ -42,7 +42,8 @@
 
 from restkit.util import url_quote
 
-from .exceptions import *
+from .exceptions import InvalidAttachment, NoResultFound, \
+ResourceNotFound, ResourceConflict 
 from . import resource
 from .utils import validate_dbname, json
 

diff --git a/couchdbkit/ext/pylons/auth/model.py b/couchdbkit/ext/pylons/auth/model.py
@@ -7,7 +7,7 @@
 import os
 
 
-from ...schema import Document, SchemaListProperty, StringProperty, \
+from .... import Document, SchemaListProperty, StringProperty, \
 StringListProperty
 
 class Permission(Document):

diff --git a/couchdbkit/schema/base.py b/couchdbkit/schema/base.py
@@ -17,8 +17,8 @@
 from .properties import value_to_python, \
 convert_property, MAP_TYPES_PROPERTIES, ALLOWED_PROPERTY_TYPES, \
 LazyDict, LazyList, value_to_json
-from ..exceptions import *
-from ..exceptions import ResourceNotFound
+from ..exceptions import DuplicatePropertyError, ResourceNotFound, \
+ReservedWordError 
 
 
 __all__ = ['ReservedWordError', 'ALLOWED_PROPERTY_TYPES', 'DocumentSchema',

diff --git a/couchdbkit/schema/properties_proxy.py b/couchdbkit/schema/properties_proxy.py
@@ -10,10 +10,10 @@
 import decimal
 import time
 
-from ..exceptions import *
-from .properties import Property
+from ..exceptions import BadValueError 
 
 from .base import DocumentSchema, ALLOWED_PROPERTY_TYPES
+from .properties import Property
 
 __all__ = ['SchemaProperty', 'SchemaListProperty', 'SchemaDictProperty']
 

diff --git a/couchdbkit/wsgi/handler.py b/couchdbkit/wsgi/handler.py
@@ -9,7 +9,7 @@
 import traceback
 from urllib import unquote
 
-from restkit.utils import url_encode
+from restkit.util import url_encode
 
 from .. import __version__
 from ..external import External

diff --git a/couchdbkit/wsgi/proxy.py b/couchdbkit/wsgi/proxy.py
@@ -5,8 +5,7 @@
 
 import urlparse
 
-from restkit.contrib.wsgi_proxy import HostProxy, get_config, ALLOWED_METHODS
-from restkit.pool.simple import SimplePool
+from restkit.contrib.wsgi_proxy import HostProxy, ALLOWED_METHODS
 from webob import Request
 
 class CouchdbProxy(object):
@@ -19,14 +18,11 @@ class CouchdbProxy(object):
         application = CouchdbProxy()
     """
 
-    def __init__(self, uri="http://127.0.0.1:5984", pool=None,
-            allowed_method=ALLOWED_METHODS, **local_config):
-        if not pool:
-            pool = SimplePool(keepalive=10)
-        config = get_config(local_config)
-        self.proxy = HostProxy(uri, pool=pool, 
-                        allowed_methods=allowed_method, **config)
-
+    def __init__(self, uri="http://127.0.0.1:5984",
+            allowed_method=ALLOWED_METHODS, **kwargs):
+        self.proxy = HostProxy(uri,  allowed_methods=allowed_method,
+                **kwargs)
+
     def do_proxy(self, req, environ, start_response):
         """\
         return proxy response. Can be overrided to add authentification and