#3: Specify CS endpoint v4 when calling the blues (fixes #2)

charmstore/lib.py

@@ -26,12 +26,13 @@
 ]
 
 DEFAULT_TIMEOUT = 10
+DEFAULT_CS_API_URL = 'https://api.jujucharms.com/v4'
 
 
 class CharmStore(object):
-    def __init__(self, api='https://api.jujucharms.com/v4'):
+    def __init__(self, api=DEFAULT_CS_API_URL):
         super(CharmStore, self).__init__()
-        self.theblues = charmstore.CharmStore(api)
+        self.theblues = charmstore.CharmStore(url=api)
 
     def requires(self, interfaces=[], limit=None):
         return self.interfaces(requires=interfaces)
@@ -81,7 +82,8 @@ def from_data(cls, data):
 
         return e
 
-    def __init__(self, id=None, timeout=DEFAULT_TIMEOUT):
+    def __init__(self, id=None, api=DEFAULT_CS_API_URL,
+                 timeout=DEFAULT_TIMEOUT):
         self.id = None
         self.name = None
         self.owner = None
@@ -99,7 +101,7 @@ def __init__(self, id=None, timeout=DEFAULT_TIMEOUT):
         self.stats = {}
 
         self.raw = {}
-        self.theblues = charmstore.CharmStore(timeout=timeout)
+        self.theblues = charmstore.CharmStore(url=api, timeout=timeout)
 
         if id:
             self.load(
@@ -139,7 +141,8 @@ def load(self, data):
 
 
 class Charm(Entity):
-    def __init__(self, id=None, timeout=DEFAULT_TIMEOUT):
+    def __init__(self, id=None, api=DEFAULT_CS_API_URL,
+                 timeout=DEFAULT_TIMEOUT):
         self.summary = None
         self.description = None
 
@@ -154,7 +157,7 @@ def __init__(self, id=None, timeout=DEFAULT_TIMEOUT):
         self.bundles = []
         self.terms = []
 
-        super(Charm, self).__init__(id, timeout)
+        super(Charm, self).__init__(id, api=api, timeout=timeout)
 
     def related(self):
         data = self.raw.get('charm-related')

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='libcharmstore',
-    version='0.0.4',
+    version='0.0.5',
     packages=['charmstore'],
     maintainer='Marco Ceppi',
     install_requires=[