merging develop

16 files changed, 17 insertions, 17 deletions

diff --git a/python-tornado/README.md b/python-tornado/README.md
index 59e79b7..eaa2fe0 100644
--- a/python-tornado/README.md
+++ b/python-tornado/README.md
@@ -12,7 +12,7 @@ pubnub.start()
 
 #### Import
 ```
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 ```
 
 #### Init
diff --git a/python-tornado/examples/audit.py b/python-tornado/examples/audit.py
index 77d189b..3f6af13 100644
--- a/python-tornado/examples/audit.py
+++ b/python-tornado/examples/audit.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-tornado/examples/grant.py b/python-tornado/examples/grant.py
index daf7434..e2726b9 100644
--- a/python-tornado/examples/grant.py
+++ b/python-tornado/examples/grant.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-tornado/examples/here-now.py b/python-tornado/examples/here-now.py
index 5c195f1..7018be7 100644
--- a/python-tornado/examples/here-now.py
+++ b/python-tornado/examples/here-now.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/history.py b/python-tornado/examples/history.py
index daf1c6e..ff85545 100644
--- a/python-tornado/examples/history.py
+++ b/python-tornado/examples/history.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/presence_group.py b/python-tornado/examples/presence_group.py
index bb89420..38181cf 100644
--- a/python-tornado/examples/presence_group.py
+++ b/python-tornado/examples/presence_group.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/publish.py b/python-tornado/examples/publish.py
index 04e88fd..997adfa 100644
--- a/python-tornado/examples/publish.py
+++ b/python-tornado/examples/publish.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/revoke.py b/python-tornado/examples/revoke.py
index 1e4487e..4bdd9c7 100644
--- a/python-tornado/examples/revoke.py
+++ b/python-tornado/examples/revoke.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam'
diff --git a/python-tornado/examples/subscribe.py b/python-tornado/examples/subscribe.py
index 72f0fc1..96c6ebb 100644
--- a/python-tornado/examples/subscribe.py
+++ b/python-tornado/examples/subscribe.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/examples/subscribe_group.py b/python-tornado/examples/subscribe_group.py
index eddcf8d..394821a 100644
--- a/python-tornado/examples/subscribe_group.py
+++ b/python-tornado/examples/subscribe_group.py
@@ -7,7 +7,7 @@
 
 
 import sys
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/migration.md b/python-tornado/migration.md
index d5fd8f0..6a1abf3 100644
--- a/python-tornado/migration.md
+++ b/python-tornado/migration.md
@@ -7,10 +7,10 @@
 
 ```
 # Pre 3.5:
-from Pubnub import Pubnub
+from pubnub import Pubnub
 
 # New in 3.5+
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 
 ```
 
diff --git a/python-tornado/tests/benchmark.py b/python-tornado/tests/benchmark.py
index 748fe3b..6023017 100644
--- a/python-tornado/tests/benchmark.py
+++ b/python-tornado/tests/benchmark.py
@@ -12,7 +12,7 @@
 import sys
 import datetime
 import tornado
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
diff --git a/python-tornado/tests/delivery.py b/python-tornado/tests/delivery.py
index 0181403..21486da 100644
--- a/python-tornado/tests/delivery.py
+++ b/python-tornado/tests/delivery.py
@@ -14,7 +14,7 @@ import datetime
 import time
 import math
 
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 
 ## -----------------------------------------------------------------------
 ## Configuration
diff --git a/python-tornado/tests/subscribe-test.py b/python-tornado/tests/subscribe-test.py
index bcbbc7e..7b57415 100755
--- a/python-tornado/tests/subscribe-test.py
+++ b/python-tornado/tests/subscribe-test.py
@@ -11,7 +11,7 @@
 
 import sys
 import datetime
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 from functools import partial
 from threading import current_thread
 import threading
diff --git a/python-tornado/tests/test_grant_async.py b/python-tornado/tests/test_grant_async.py
index b51b275..c03cf08 100644
--- a/python-tornado/tests/test_grant_async.py
+++ b/python-tornado/tests/test_grant_async.py
@@ -1,6 +1,6 @@
 
 
-from Pubnub import PubnubTornado as Pubnub
+from pubnub import PubnubTornado as Pubnub
 import time
 
 pubnub = Pubnub("demo","demo")
diff --git a/python-tornado/tests/test_publish_async.py b/python-tornado/tests/test_publish_async.py
index 391297d..1f442ed 100644
--- a/python-tornado/tests/test_publish_async.py
+++ b/python-tornado/tests/test_publish_async.py
@@ -1,6 +1,6 @@
 
 
-from Pubnub import PubnubTwisted as Pubnub
+from pubnub import PubnubTwisted as Pubnub
 import time
 
 pubnub = Pubnub("demo","demo")