Tidying. Additional gitignore lines. Don't need the conditional simplejson because we don't support Python 2.5.

Author: joncotton

.gitignore

@@ -1,5 +1,6 @@
 *.pyc
-Embedly.egg-info/
+*.egg-info/
+.tox/
 build/
 dist/
 .virtualenv

embedly/client.py

@@ -53,7 +53,8 @@ def get_services(self):
         the list of supported providers and their regexes
         """
 
-        if self.services: return self.services
+        if self.services:
+            return self.services
 
         url = 'http://api.embed.ly/1/services/python'
 
@@ -66,10 +67,10 @@ def get_services(self):
             resp_data = json.loads(content)
             self.services = resp_data
 
-            #build the regex that we can use later.
+            # build the regex that we can use later
             _regex = []
             for each in self.get_services():
-                _regex.append('|'.join(each.get('regex',[])))
+                _regex.append('|'.join(each.get('regex', [])))
 
             self._regex = re.compile('|'.join(_regex))
 
@@ -100,10 +101,10 @@ def _get(self, version, method, url_or_urls, **kwargs):
             raise ValueError('%s requires a url or a list of urls given: %s' %
                              (method.title(), url_or_urls))
 
-        #A flag we can use instead of calling isinstance all the time.
+        # a flag we can use instead of calling isinstance() all the time
         multi = isinstance(url_or_urls, list)
 
-        # Throw an error early for too many URLs
+        # throw an error early for too many URLs
         if multi and len(url_or_urls) > 20:
             raise ValueError('Embedly accepts only 20 urls at a time. Url '
                              'Count:%s' % len(url_or_urls))
@@ -112,7 +113,7 @@ def _get(self, version, method, url_or_urls, **kwargs):
 
         key = kwargs.get('key', self.key)
 
-        #make sure that a key was set on the client or passed in.
+        # make sure that a key was set on the client or passed in
         if not key:
             raise ValueError('Requires a key. None given: %s' % key)
 

setup.py

@@ -3,16 +3,12 @@
 import codecs
 from setuptools import setup
 
-extra = {}
-
 required = ['httplib2']
 tests_require = []
 
 if sys.version_info[:2] < (2, 7):
     tests_require.append('unittest2')
 
-if sys.version_info[:2] < (2, 6):
-    required.append('simplejson')
 
 def get_version():
     with open(os.path.join('embedly', '__init__.py')) as f:
@@ -53,6 +49,5 @@ def get_version():
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
-    ),
-    **extra
+    )
 )