Remove configuration class

Author: Laurynas Butkus

convertapi/__init__.py

@@ -1,9 +1,18 @@
 __version__ = '0.0.1'
 
 from .exceptions import *
-from .configuration import Configuration
 from .client import Client
 from .api import convert
 
-configuration = Configuration()
-client = Client(configuration)
+# configuration
+
+api_secret = None
+base_uri = 'https://v2.convertapi.com/'
+user_agent = 'ConvertAPI-Python/' + __version__
+timeout = 60
+conversion_timeout = 180
+conversion_timeout_delta = 10
+upload_timeout = 600
+download_timeout = 600
+
+client = Client()

convertapi/client.py

@@ -1,23 +1,21 @@
 import requests
+import convertapi
 
 from .exceptions import *
 
 class Client:
-	def __init__(self, configuration):
-		self.configuration = configuration
-
 	def get(self, path, params = {}, timeout = None):
-		timeout = timeout or self.configuration.timeout
+		timeout = timeout or convertapi.timeout
 		r = requests.get(self.url(path), params = params, headers = self.headers(), timeout = timeout)
 		return self.handle_response(r)
 
 	def post(self, path, payload, timeout = None):
-		timeout = timeout or self.configuration.timeout
+		timeout = timeout or convertapi.timeout
 		r = requests.post(self.url(path), data = payload, headers = self.headers(), timeout = timeout)
 		return self.handle_response(r)
 
 	def download(self, url, path):
-		r = requests.get(url, stream = True, timeout = self.configuration.download_timeout)
+		r = requests.get(url, stream = True, timeout = convertapi.download_timeout)
 
 		with open(path, 'wb') as f:
 			for chunk in r.iter_content(chunk_size = 1024):
@@ -37,9 +35,9 @@ def handle_response(self, r):
 		return json
 
 	def url(self, path):
-		return "%s%s?Secret=%s" % (self.configuration.base_uri, path, self.configuration.api_secret)
+		return "%s%s?Secret=%s" % (convertapi.base_uri, path, convertapi.api_secret)
 
 	def headers(self):
 		return {
-			'User-Agent': self.configuration.user_agent,
+			'User-Agent': convertapi.user_agent,
 		}

convertapi/configuration.py

@@ -7,7 +7,7 @@ def __init__(self, from_format, to_format, params, conversion_timeout = None):
         self.from_format = from_format
         self.to_format = to_format
         self.params = params
-        self.conversion_timeout = conversion_timeout or convertapi.configuration.conversion_timeout
+        self.conversion_timeout = conversion_timeout or convertapi.conversion_timeout
 
         self.default_params = {
             'Timeout': self.conversion_timeout,
@@ -17,7 +17,7 @@ def __init__(self, from_format, to_format, params, conversion_timeout = None):
     def run(self):
         params = self.__normalize_params()
         from_format = self.from_format
-        timeout = self.conversion_timeout + convertapi.configuration.conversion_timeout_delta
+        timeout = self.conversion_timeout + convertapi.conversion_timeout_delta
         path = "convert/%s/to/%s" % (from_format, self.to_format)
 
         response = convertapi.client.post(path, params, timeout = timeout)

convertapi/task.py

@@ -7,14 +7,14 @@
 
 class TestConvertapi(utils.TestCase):
 	def setUp(self):
-		convertapi.configuration.api_secret = os.environ['CONVERT_API_SECRET']
+		convertapi.api_secret = os.environ['CONVERT_API_SECRET']
 
 	def test_defaults(self):
-		eq_('https://v2.convertapi.com/', convertapi.configuration.base_uri)
+		eq_('https://v2.convertapi.com/', convertapi.base_uri)
 
 	def test_configuration(self):
-		convertapi.configuration.api_secret = 'TEST'
-		eq_('TEST', convertapi.client.configuration.api_secret)
+		convertapi.api_secret = 'TEST'
+		eq_('TEST', convertapi.api_secret)
 
 	def test_convert(self):
 		result = convertapi.convert('pdf', { 'Url': 'http://convertapi.com' }, 'web')