Merge branch 'master' into top-level-entity-naming

superdiana · web-flow · commit c7160da8eb04 · 2021-01-25T23:44:29.000-05:00
diff --git a/.gitignore b/.gitignore
@@ -43,9 +43,13 @@ docs/_build/
 
 # Virtual env
 venv/
+env/
 
 # Mac Desktop files
 .DS_Store
 
 # IDE
 .vscode
+
+#Pypi
+.pypirc
diff --git a/opentok/opentok.py b/opentok/opentok.py
@@ -82,7 +82,9 @@ class ArchiveModes(Enum):
 logger = logging.getLogger("opentok")
 
 
+
 class Client(object):
+
     """Use this SDK to create tokens and interface with the server-side portion
     of the Opentok API.
     """
diff --git a/tests/test_getter_setter.py b/tests/test_getter_setter.py
@@ -14,6 +14,7 @@ def setUp(self):
         self.session_id = u(
             "1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4"
         )
+
         self.opentok = Client(self.api_key, self.api_secret)
 
     def test_getset_jwt_livetime(self):

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ def setUp(self):`
`14`	`14`	`self.session_id = u(`
`15`	`15`	`"1_MX4xMjM0NTZ-flNhdCBNYXIgMTUgMTQ6NDI6MjMgUERUIDIwMTR-MC40OTAxMzAyNX4"`
`16`	`16`	`)`
	`17`	`+`
`17`	`18`	`self.opentok = Client(self.api_key, self.api_secret)`
`18`	`19`
`19`	`20`	`def test_getset_jwt_livetime(self):`