Merge branch 'master' into patch-2

Author: aiham

.travis.yml

@@ -2,10 +2,10 @@ language: python
 python:
 - '2.6'
 - '2.7'
-- '3.2'
 - '3.3'
 - '3.4'
 - '3.5'
+- '3.6'
 install:
 - pip install -r test_requirements.txt
 - pip install -r requirements.txt

opentok/opentok.py

@@ -130,7 +130,7 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, dat
             raise OpenTokException(u('Cannot generate token, expire_time is not in the future {0}').format(expire_time))
         if expire_time > now + (60*60*24*30):  # 30 days
             raise OpenTokException(u('Cannot generate token, expire_time is not in the next 30 days {0}').format(expire_time))
-        if (data is not None) and len(data) > 1000:
+        if data and len(data) > 1000:
             raise OpenTokException(u('Cannot generate token, data must be less than 1000 characters').format(data))
 
         # decode session id to verify api_key
@@ -150,9 +150,10 @@ def generate_token(self, session_id, role=Roles.publisher, expire_time=None, dat
             create_time     = now,
             expire_time     = expire_time,
             role            = role.value,
-            connection_data = (data or None),
             nonce           = random.randint(0,999999)
         )
+        if data:
+            data_params['connection_data'] = data
         data_string = urlencode(data_params, True)
 
         sig = self._sign_string(data_string, self.api_secret)
@@ -291,7 +292,7 @@ def session_url(self):
 
     def archive_url(self, archive_id=None):
         """For internal use."""
-        url = self.api_url + '/v2/partner/' + self.api_key + '/archive'
+        url = self.api_url + '/v2/project/' + self.api_key + '/archive'
         if archive_id:
             url = url + '/' + archive_id
         return url

tests/test_archive.py

@@ -35,7 +35,7 @@ def test_stop_archive(self):
             u('outputMode'): OutputModes.composed.value,
             u('url'): None,
         })
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive/{1}/stop').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive/{1}/stop').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -96,7 +96,7 @@ def test_delete_archive(self):
             u('outputMode'): OutputModes.composed.value,
             u('url'): None,
         })
-        httpretty.register_uri(httpretty.DELETE, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.DELETE, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=u(''),
                                status=204)
 

tests/test_archive_api.py

@@ -20,7 +20,7 @@ def setUp(self):
 
     @httpretty.activate
     def test_start_archive(self):
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -71,7 +71,7 @@ def test_start_archive(self):
 
     @httpretty.activate
     def test_start_archive_with_name(self):
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -120,7 +120,7 @@ def test_start_archive_with_name(self):
 
     @httpretty.activate
     def test_start_voice_archive(self):
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -171,7 +171,7 @@ def test_start_voice_archive(self):
 
     @httpretty.activate
     def test_start_individual_archive(self):
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -223,7 +223,7 @@ def test_start_individual_archive(self):
 
     @httpretty.activate
     def test_start_composed_archive(self):
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243556,
@@ -276,7 +276,7 @@ def test_start_composed_archive(self):
     @httpretty.activate
     def test_stop_archive(self):
         archive_id = u('30b3ebf1-ba36-4f5b-8def-6f70d9986fe9')
-        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/partner/{0}/archive/{1}/stop').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.POST, u('https://api.opentok.com/v2/project/{0}/archive/{1}/stop').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395183243000,
@@ -319,7 +319,7 @@ def test_stop_archive(self):
     @httpretty.activate
     def test_delete_archive(self):
         archive_id = u('30b3ebf1-ba36-4f5b-8def-6f70d9986fe9')
-        httpretty.register_uri(httpretty.DELETE, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.DELETE, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=u(''),
                                status=204)
 
@@ -332,7 +332,7 @@ def test_delete_archive(self):
     @httpretty.activate
     def test_find_archive(self):
         archive_id = u('f6e7ee58-d6cf-4a59-896b-6d56b158ec71')
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395187836000,
@@ -374,7 +374,7 @@ def test_find_archive(self):
 
     @httpretty.activate
     def test_find_archives(self):
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "count" : 6,
@@ -479,7 +479,7 @@ def test_find_archives(self):
 
     @httpretty.activate
     def test_find_archives_with_offset(self):
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "count" : 6,
@@ -542,7 +542,7 @@ def test_find_archives_with_offset(self):
 
     @httpretty.activate
     def test_find_archives_with_count(self):
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "count" : 6,
@@ -592,7 +592,7 @@ def test_find_archives_with_count(self):
 
     @httpretty.activate
     def test_find_archives_with_offset_and_count(self):
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive').format(self.api_key),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive').format(self.api_key),
                                body=textwrap.dedent(u("""\
                                        {
                                           "count" : 6,
@@ -670,7 +670,7 @@ def test_find_archives_with_offset_and_count(self):
     @httpretty.activate
     def test_find_paused_archive(self):
         archive_id = u('f6e7ee58-d6cf-4a59-896b-6d56b158ec71')
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395187836000,
@@ -697,7 +697,7 @@ def test_find_paused_archive(self):
     @httpretty.activate
     def test_find_expired_archive(self):
         archive_id = u('f6e7ee58-d6cf-4a59-896b-6d56b158ec71')
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395187836000,
@@ -724,7 +724,7 @@ def test_find_expired_archive(self):
     @httpretty.activate
     def test_find_archive_with_unknown_properties(self):
         archive_id = u('f6e7ee58-d6cf-4a59-896b-6d56b158ec71')
-        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/partner/{0}/archive/{1}').format(self.api_key, archive_id),
+        httpretty.register_uri(httpretty.GET, u('https://api.opentok.com/v2/project/{0}/archive/{1}').format(self.api_key, archive_id),
                                body=textwrap.dedent(u("""\
                                        {
                                           "createdAt" : 1395187836000,

tests/test_token_generation.py

@@ -64,6 +64,12 @@ def test_generate_data_token(self):
         assert token_decoder(token)[u('connection_data')] == data
         assert token_signature_validator(token, self.api_secret)
 
+    def test_generate_no_data_token(self):
+        token = self.opentok.generate_token(self.session_id)
+        assert isinstance(token, text_type)
+        assert u('connection_data') not in token_decoder(token)
+        assert token_signature_validator(token, self.api_secret)
+
     @raises(TypeError)
     def test_does_not_generate_token_without_params(self):
         token = self.opentok.generate_token()