Merge branch 'master' of bitbucket.org:yackob03/quay

tools/auditancestry.py

@@ -3,13 +3,12 @@ import json
 
 from data.database import Image, ImageStorage, Repository
 from data import model
-from app import app
+from app import app, storage as store
 
 import boto.s3.connection
 import boto.s3.key
 
 
-store = app.config['STORAGE']
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 

tools/audittagimages.py

@@ -1,9 +1,6 @@
 from data.database import Image, RepositoryTag, Repository
 
-from app import app
-
-
-store = app.config['STORAGE']
+from app import storage as store
 
 
 tag_query = (RepositoryTag

tools/freeloaders.py

@@ -1,13 +1,13 @@
 from data import model
 from data.database import User
-from app import stripe
+from app import billing as stripe
 from data.plans import get_plan
 
 def get_private_allowed(customer):
   if not customer.stripe_id:
     return 0
 
-  subscription = stripe.Customer.retrieve(customer.stripe_id).subscription
+  subscription = stripe.Customer.retrieve(customer.stripe_id).get('subscription', None)
   if subscription is None:
     return 0
 

tools/orphans.py

@@ -1,13 +1,11 @@
 from data.database import Image
-from app import app
+from app import app, storage as store
 
 live_image_id_set = set()
 
 for image in Image.select():
   live_image_id_set.add(image.docker_image_id)
 
-store = app.config['STORAGE']
-
 storage_image_id_set = set()
 for customer in store.list_directory('images/'):
   for repo in store.list_directory(customer):