Merge pull request #2233 from gittip/env-billing

Remove os.environ from wireup.billing

configure-aspen.py

@@ -39,7 +39,7 @@
 env = website.env = gittip.wireup.env()
 gittip.wireup.canonical(env)
 website.db = gittip.wireup.db(env)
-gittip.wireup.billing()
+gittip.wireup.billing(env)
 gittip.wireup.username_restrictions(website)
 gittip.wireup.nanswers(env)
 gittip.wireup.accounts_elsewhere(website, env)

gittip/wireup.py

@@ -39,10 +39,10 @@ def db(env):
  return db
 
 
-def billing():
- stripe.api_key= os.environ['STRIPE_SECRET_API_KEY']
- stripe.publishable_api_key= os.environ['STRIPE_PUBLISHABLE_API_KEY']
- balanced.configure(os.environ['BALANCED_API_SECRET'])
+def billing(env):
+ stripe.api_key = env.stripe_secret_api_key
+ stripe.publishable_api_key = env.stripe_publishable_api_key
+ balanced.configure(env.balanced_api_secret)
 
 
 def username_restrictions(website):

tests/py/test_hooks.py

@@ -11,8 +11,8 @@ class Tests(Harness):
  def setUp(self):
  Harness.setUp(self)
 
- # Grab configuration from os.environ, storing for later.
- env = Environment(CANONICAL_SCHEME=unicode, CANONICAL_HOST=unicode)
+ # Grab configuration from the environment, storing for later.
+ env = wireup.env()
  self.environ = env.environ
 
  # Change env, doesn't change self.environ.

tests/py/test_stats.py

@@ -101,7 +101,8 @@ def test_stats_description_accurate_during_payday_run(self):
  with patch.object(datetime, 'datetime') as mock_datetime:
  mock_datetime.utcnow.return_value = a_thursday
 
- wireup.billing()
+ env = wireup.env()
+ wireup.billing(env)
  payday = Payday(self.db)
  payday.start()