phiggy changes.

kurtiss · Nov 6, 2010 · 27710ad · 27710ad
1 parent 2e1cac5
commit 27710ad
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 463 deletions.
diff --git a/setup.py b/setup.py
@@ -28,6 +28,7 @@
         'Topic :: Software Development :: Libraries :: Python Modules'
     ],
     install_requires = [
+#       'confy',
 #       'tornado',
 #       'pymongo',
 #       'memcache'

diff --git a/shrapnel/caching.py b/shrapnel/caching.py
@@ -8,7 +8,7 @@
 """
 
 import bisect
-import config
+import confy
 import functools
 import itertools
 import os
@@ -67,7 +67,7 @@ def decorated(*args, **kwargs):
             if not type(generator) == types.GeneratorType:
                 raise_error("It must return a generator.")
 
-            mc = config.instance("memcache.{0}".format(memcached_instance))
+            mc = confy.instance("memcache.{0}".format(memcached_instance))
 
             if not callable(getattr(mc, 'get', None)) or not callable(getattr(mc, 'set', None)):
                 raise_error("The <memcached> instance for this function must support the .get(...) and .set(...) methods.")

diff --git a/shrapnel/command.py b/shrapnel/command.py
@@ -7,7 +7,6 @@
 Copyright (c) 2010 Medium Entertainment, Inc. All rights reserved.
 """
 
-from shrapnel import config
 import logging
 import logging.handlers
 import optparse

diff --git a/shrapnel/config.py b/shrapnel/config.py