Rename 'etsy_env' module to 'env'

alekstorm · Nov 5, 2011 · c7a5d02 · c7a5d02
1 parent a3eac45
commit c7a5d02
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/etsy/__init__.py b/etsy/__init__.py
@@ -1,10 +1,9 @@
 from _v2 import EtsyV2 as Etsy
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 
 __version__ = '0.3.1'
 __author__ = 'Dan McKinley'
 __copyright__ = 'Copyright 2010, Etsy Inc.'
 __license__ = 'GPL v3'
 __email__ = 'dan@etsy.com'
-
diff --git a/etsy/_v2.py b/etsy/_v2.py
@@ -1,6 +1,6 @@
 import urllib
 from _core import API, missing
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 try:
     from urlparse import parse_qsl
@@ -11,7 +11,7 @@ class EtsyV2(API):
     api_version = 'v2'
 
     def __init__(self, api_key='', key_file=None, method_cache=missing, 
-                 etsy_env=EtsyEnvSandbox(), log=None, etsy_oauth_client=None):
+                 etsy_env=EtsyEnvSandbox, log=None, etsy_oauth_client=None):
         self.api_url = etsy_env.api_url
         self.etsy_oauth_client = None
 

diff --git a/etsy/etsy_env.py → etsy/env.py b/etsy/etsy_env.py → etsy/env.py
diff --git a/etsy/oauth.py b/etsy/oauth.py
@@ -1,12 +1,12 @@
 import oauth2 as oauth
 import urllib
 from cgi import parse_qsl
-from etsy_env import EtsyEnvSandbox, EtsyEnvProduction
+from env import EtsyEnvSandbox, EtsyEnvProduction
 
 EtsyOAuthToken = oauth.Token
 
 class EtsyOAuthClient(oauth.Client):
-    def __init__(self, oauth_consumer_key, oauth_consumer_secret, etsy_env=EtsyEnvSandbox(), token=None, logger=None):
+    def __init__(self, oauth_consumer_key, oauth_consumer_secret, etsy_env=EtsyEnvSandbox, token=None, logger=None):
         consumer = oauth.Consumer(oauth_consumer_key, oauth_consumer_secret)
         super(EtsyOAuthClient, self).__init__(consumer)
         self.request_token_url = etsy_env.request_token_url