top level entity naming

Author: superdiana

opentok/__init__.py

@@ -1,4 +1,4 @@
-from .opentok import OpenTok, Roles, MediaModes, ArchiveModes
+from .opentok import Client, Roles, MediaModes, ArchiveModes
 from .session import Session
 from .archives import Archive, ArchiveList, OutputModes
 from .exceptions import (
@@ -7,7 +7,7 @@
     ForceDisconnectError,
     ArchiveError,
     SetStreamClassError,
-    BroadcastError
+    BroadcastError,
 )
 from .version import __version__
 from .stream import Stream

opentok/opentok.py

@@ -76,7 +76,7 @@ class ArchiveModes(Enum):
     """The session will be automatically archived."""
 
 
-class OpenTok(object):
+class Client(object):
     """Use this SDK to create tokens and interface with the server-side portion
     of the Opentok API.
     """

sample/Archiving/archiving.py

@@ -1,5 +1,5 @@
 from flask import Flask, render_template, request, redirect, url_for
-from opentok import OpenTok, MediaModes, OutputModes
+from opentok import Client, MediaModes, OutputModes
 from email.utils import formatdate
 import os, time
 
@@ -10,7 +10,7 @@
     raise Exception("You must define API_KEY and API_SECRET environment variables")
 
 app = Flask(__name__)
-opentok = OpenTok(api_key, api_secret)
+opentok = Client(api_key, api_secret)
 session = opentok.create_session(media_mode=MediaModes.routed)
 
 

sample/HelloWorld/helloworld.py

@@ -1,5 +1,5 @@
 from flask import Flask, render_template
-from opentok import OpenTok
+from opentok import Client
 import os
 
 try:
@@ -9,7 +9,7 @@
     raise Exception("You must define API_KEY and API_SECRET environment variables")
 
 app = Flask(__name__)
-opentok = OpenTok(api_key, api_secret)
+opentok = Client(api_key, api_secret)
 session = opentok.create_session()
 
 

tests/test_archive.py

@@ -9,14 +9,14 @@
 import pytz
 from .validate_jwt import validate_jwt_header
 
-from opentok import OpenTok, Archive, __version__, OutputModes
+from opentok import Client, Archive, __version__, OutputModes
 
 
 class OpenTokArchiveTest(unittest.TestCase):
     def setUp(self):
         self.api_key = u("123456")
         self.api_secret = u("1234567890abcdef1234567890abcdef1234567890")
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)
 
     @httpretty.activate
     def test_stop_archive(self):

tests/test_archive_api.py

@@ -10,7 +10,7 @@
 from .validate_jwt import validate_jwt_header
 
 from opentok import (
-    OpenTok,
+    Client,
     Archive,
     ArchiveList,
     OutputModes,
@@ -25,7 +25,7 @@ def setUp(self):
         self.api_key = u("123456")
         self.api_secret = u("1234567890abcdef1234567890abcdef1234567890")
         self.session_id = u("SESSIONID")
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)
 
     @httpretty.activate
     def test_start_archive(self):

tests/test_broadcast.py

@@ -4,15 +4,15 @@
 
 from six import u
 from expects import *
-from opentok import OpenTok, Broadcast, __version__, BroadcastError
+from opentok import Client, Broadcast, __version__, BroadcastError
 from .validate_jwt import validate_jwt_header
 
 
 class OpenTokBroadcastTest(unittest.TestCase):
     def setUp(self):
         self.api_key = u("123456")
         self.api_secret = u("1234567890abcdef1234567890abcdef1234567890")
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)
         self.session_id = u("2_MX4xMDBfjE0Mzc2NzY1NDgwMTJ-TjMzfn4")
 
     @httpretty.activate

tests/test_force_disconnect.py

@@ -3,7 +3,7 @@
 from expects import *
 import httpretty
 
-from opentok import OpenTok, __version__, AuthError, ForceDisconnectError
+from opentok import Client, __version__, AuthError, ForceDisconnectError
 from .validate_jwt import validate_jwt_header
 
 
@@ -13,7 +13,7 @@ class OpenTokForceDisconnectTest(unittest.TestCase):
     def setUp(self):
         self.api_key = u("123456")
         self.api_secret = u("1234567890abcdef1234567890abcdef1234567890")
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)
         self.session_id = u("SESSIONID")
         self.connection_id = u("CONNECTIONID")
 

tests/test_getter_setter.py

@@ -3,7 +3,7 @@
 from nose.tools import raises
 from expects import *
 
-from opentok import OpenTok, __version__
+from opentok import Client, __version__
 
 
 class GetterSetterTest(unittest.TestCase):
@@ -13,4 +13,4 @@ def setUp(self):
         self.session_id = u(
             "1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4"
         )
-        self.opentok = OpenTok(self.api_key, self.api_secret)
+        self.opentok = Client(self.api_key, self.api_secret)

tests/test_http_options.py

@@ -4,7 +4,7 @@
 import httpretty
 import requests
 
-from opentok import OpenTok, OpenTokException
+from opentok import Client, OpenTokException
 
 
 def _raise_timeout(*args):
@@ -29,5 +29,5 @@ def tearDown(self):
 
     @raises(OpenTokException)
     def test_timeout(self):
-        opentok = OpenTok(self.api_key, self.api_secret, timeout=1)
+        opentok = Client(self.api_key, self.api_secret, timeout=1)
         opentok.create_session()