Dec 7, 2011 · Dec 6, 2011 · Dec 7, 2011 · Dec 7, 2011 · Dec 7, 2011
diff --git a/.gitignore b/.gitignore
 MANIFEST
 dist/
 env/
 build/
diff --git a/test/test_zencoder.py b/test/test_zencoder.py

    def test_api_key(self):
        """ initialize zencoder object and test api key """
        api_key = 'abcd123'
        api_key = 'testapikey'
        zc = Zencoder(api_key=api_key)
        self.assertEquals(zc.api_key, api_key)

        zc = Zencoder()
        self.assertEquals(zc.api_key, 'abcd123')

    def test_default_api_version(self):
        os.environ['ZENCODER_API_KEY'] = 'abcd123'
        zc = Zencoder()
        self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/v2/')

    def test_set_api_version(self):
        os.environ['ZENCODER_API_KEY'] = 'abcd123'
        zc = Zencoder(api_version='v1')
        self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/v1/')

    def test_set_api_edge_version(self):
        os.environ['ZENCODER_API_KEY'] = 'abcd123'
        zc = Zencoder(api_version='edge')
        self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/')

 if __name__ == "__main__":
    unittest.main()

diff --git a/zencoder/__init__.py b/zencoder/__init__.py
 from core import Zencoder
 from core import ZencoderResponseError

 from core import Account
diff --git a/zencoder/core.py b/zencoder/core.py
        if resource_name:
            self.base_url = self.base_url + resource_name

        #TODO investigate httplib2 caching and if it is necessary
        self.http = httplib2.Http(timeout=timeout)
        self.as_xml = as_xml
        self.api_key = api_key
        """
        super(Account, self).__init__(base_url, api_key, as_xml, 'account', timeout=timeout)

    def create(self, email, tos=True, options=None):
    def create(self, email, tos=1, options=None):
        """
        Creates an account with Zencoder, no API Key necessary.
        """
        data = {'email': email,
                'terms_of_service':int(tos)}
                'terms_of_service':str(tos)}
        if options:
            data.update(options)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,7 +9,7 @@ def setUp(self):

		def test_api_key(self):
		""" initialize zencoder object and test api key """
		api_key = 'abcd123'
		api_key = 'testapikey'
		zc = Zencoder(api_key=api_key)
		self.assertEquals(zc.api_key, api_key)

Expand All		@@ -19,6 +19,21 @@ def test_api_key_env_var(self):
		zc = Zencoder()
		self.assertEquals(zc.api_key, 'abcd123')

		def test_default_api_version(self):
		os.environ['ZENCODER_API_KEY'] = 'abcd123'
		zc = Zencoder()
		self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/v2/')

		def test_set_api_version(self):
		os.environ['ZENCODER_API_KEY'] = 'abcd123'
		zc = Zencoder(api_version='v1')
		self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/v1/')

		def test_set_api_edge_version(self):
		os.environ['ZENCODER_API_KEY'] = 'abcd123'
		zc = Zencoder(api_version='edge')
		self.assertEquals(zc.base_url, 'https://app.zencoder.com/api/')

		if __name__ == "__main__":
		unittest.main()
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		from core import Zencoder
		from core import ZencoderResponseError

		from core import Account
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,7 +45,6 @@ def __init__(self, base_url, api_key, as_xml=False, resource_name=None, timeout=
		if resource_name:
		self.base_url = self.base_url + resource_name

		#TODO investigate httplib2 caching and if it is necessary
		self.http = httplib2.Http(timeout=timeout)
		self.as_xml = as_xml
		self.api_key = api_key
Expand DownExpand Up		@@ -186,12 +185,12 @@ def __init__(self, base_url, api_key=None, as_xml=False, timeout=None):
		"""
		super(Account, self).__init__(base_url, api_key, as_xml, 'account', timeout=timeout)

		def create(self, email, tos=True, options=None):
		def create(self, email, tos=1, options=None):
		"""
		Creates an account with Zencoder, no API Key necessary.
		"""
		data = {'email': email,
		'terms_of_service':int(tos)}
		'terms_of_service':str(tos)}
		if options:
		data.update(options)

Expand Down