From 150ae1566d813acbb773839e919db2c0f467931c Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 16 Apr 2014 00:00:40 +0530
Subject: adding code to support async and pam client capabilities with python
 v2 and v3

---
 python-twisted/examples/publish-example.py | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index d09ad8d..d15b21b 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -19,12 +19,13 @@ publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
 secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
 cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''     ##(Cipher key is Optional)
-ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+auth_key      = len(sys.argv) > 5 and sys.argv[5] or 'abcd'     ##(Cipher key is Optional)
+ssl_on        = len(sys.argv) > 6 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
+pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on )
 crazy  = 'hello_world'
 
 ## -----------------------------------------------------------------------
@@ -33,32 +34,36 @@ crazy  = 'hello_world'
 def publish_complete(info):
     print(info)
 
+def publish_error(info):
+    print('ERROR : ' +  str(info))
+
 ## Publish string
 pubnub.publish({
     'channel' : crazy,
     'message' : 'Hello World!',
-    'callback' : publish_complete
+    'callback' : publish_complete,
+    'error' : publish_error
 })
 
 ## Publish list
 li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+
 pubnub.publish({
     'channel' : crazy,
     'message' : li,
-    'callback' : publish_complete
+    'callback' : publish_complete,
+    'error' : publish_error
 })
 
 def done_cb(info):
     publish_complete(info)
-    reactor.stop()
-## Publish Dictionary Object
+
 pubnub.publish({
     'channel' : crazy,
     'message' : { 'some_key' : 'some_val' },
-    'callback' : done_cb
+    'callback' : done_cb,
+    'error' : publish_error
 })
 
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-reactor.run()
+
+pubnub.start()
-- 
cgit v1.2.3


From 09cd0c015ae276aa849297a6a976065b2b3f247b Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 23 Apr 2014 14:03:13 +0530
Subject: modifying code for pep 8 compliance

---
 python-twisted/examples/here-now-example.py  | 22 ++++++------
 python-twisted/examples/history-example.py   | 24 +++++++------
 python-twisted/examples/publish-example.py   | 52 ++++++++++++++++------------
 python-twisted/examples/subscribe-example.py | 25 +++++++------
 python-twisted/examples/uuid-example.py      |  4 +--
 5 files changed, 71 insertions(+), 56 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
index b3c9dc0..bba7d21 100644
--- a/python-twisted/examples/here-now-example.py
+++ b/python-twisted/examples/here-now-example.py
@@ -1,4 +1,4 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud. 
+## www.pubnub.com - PubNub Real-time push service in the cloud.
 # coding=utf8
 
 ## PubNub Real-time Push APIs and Notifications Framework
@@ -13,28 +13,30 @@ import sys
 from twisted.internet import reactor
 from Pubnub import Pubnub
 
-publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
-ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## History Example
 ## -----------------------------------------------------------------------
+
+
 def here_now_complete(messages):
     print(messages)
     reactor.stop()
 
-pubnub.here_now( {
-    'channel'  : crazy,
-    'callback' : here_now_complete
+pubnub.here_now({
+    'channel': crazy,
+    'callback': here_now_complete
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
index 5f352ef..f128cd7 100644
--- a/python-twisted/examples/history-example.py
+++ b/python-twisted/examples/history-example.py
@@ -1,4 +1,4 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud. 
+## www.pubnub.com - PubNub Real-time push service in the cloud.
 # coding=utf8
 
 ## PubNub Real-time Push APIs and Notifications Framework
@@ -14,29 +14,31 @@ from twisted.internet import reactor
 sys.path.append('../')
 from Pubnub import Pubnub
 
-publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''
-ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## History Example
 ## -----------------------------------------------------------------------
+
+
 def history_complete(messages):
     print(messages)
     reactor.stop()
 
-pubnub.history( {
-    'channel'  : crazy,
-    'limit'    : 10,
-    'callback' : history_complete
+pubnub.history({
+    'channel': crazy,
+    'limit': 10,
+    'callback': history_complete
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index d15b21b..6b5b19a 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -1,4 +1,4 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud. 
+## www.pubnub.com - PubNub Real-time push service in the cloud.
 # coding=utf8
 
 ## PubNub Real-time Push APIs and Notifications Framework
@@ -15,54 +15,62 @@ sys.path.append('../')
 sys.path.append('../../')
 from Pubnub import Pubnub
 
-publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or ''     ##(Cipher key is Optional)
-auth_key      = len(sys.argv) > 5 and sys.argv[5] or 'abcd'     ##(Cipher key is Optional)
-ssl_on        = len(sys.argv) > 6 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(
+    sys.argv) > 4 and sys.argv[4] or ''  # (Cipher key is Optional)
+auth_key = len(
+    sys.argv) > 5 and sys.argv[5] or 'abcd'  # (Cipher key is Optional)
+ssl_on = len(sys.argv) > 6 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(
+    publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## Publish Example
 ## -----------------------------------------------------------------------
+
+
 def publish_complete(info):
     print(info)
 
+
 def publish_error(info):
-    print('ERROR : ' +  str(info))
+    print('ERROR : ' + str(info))
 
 ## Publish string
 pubnub.publish({
-    'channel' : crazy,
-    'message' : 'Hello World!',
-    'callback' : publish_complete,
-    'error' : publish_error
+    'channel': crazy,
+    'message': 'Hello World!',
+    'callback': publish_complete,
+    'error': publish_error
 })
 
 ## Publish list
-li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']
+li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
+      'Saturday']
 
 pubnub.publish({
-    'channel' : crazy,
-    'message' : li,
-    'callback' : publish_complete,
-    'error' : publish_error
+    'channel': crazy,
+    'message': li,
+    'callback': publish_complete,
+    'error': publish_error
 })
 
+
 def done_cb(info):
     publish_complete(info)
 
 pubnub.publish({
-    'channel' : crazy,
-    'message' : { 'some_key' : 'some_val' },
-    'callback' : done_cb,
-    'error' : publish_error
+    'channel': crazy,
+    'message': {'some_key': 'some_val'},
+    'callback': done_cb,
+    'error': publish_error
 })
 
 
diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
index cf4a919..168a2d2 100644
--- a/python-twisted/examples/subscribe-example.py
+++ b/python-twisted/examples/subscribe-example.py
@@ -1,4 +1,4 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud. 
+## www.pubnub.com - PubNub Real-time push service in the cloud.
 # coding=utf8
 
 ## PubNub Real-time Push APIs and Notifications Framework
@@ -14,32 +14,35 @@ from twisted.internet import reactor
 sys.path.append('../')
 from Pubnub import Pubnub
 
-publish_key   = len(sys.argv) > 1 and sys.argv[1] or 'demo'
+publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
 subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo'
-secret_key    = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key    = len(sys.argv) > 4 and sys.argv[4] or None
-ssl_on        = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or None
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
 #pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-pubnub = Pubnub( publish_key, subscribe_key, secret_key, ssl_on )
-crazy  = 'hello_world'
+pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on)
+crazy = 'hello_world'
 
 ## -----------------------------------------------------------------------
 ## Subscribe Example
 ## -----------------------------------------------------------------------
+
+
 def message_received(message):
     print(message)
 
-def connected() :
+
+def connected():
     print 'Connected'
 
 pubnub.subscribe({
-    'channel'  : crazy,
-    'connect'  : connected,
-    'callback' : message_received
+    'channel': crazy,
+    'connect': connected,
+    'callback': message_received
 })
 
 ## -----------------------------------------------------------------------
diff --git a/python-twisted/examples/uuid-example.py b/python-twisted/examples/uuid-example.py
index 94840e0..581051b 100644
--- a/python-twisted/examples/uuid-example.py
+++ b/python-twisted/examples/uuid-example.py
@@ -1,4 +1,4 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud. 
+## www.pubnub.com - PubNub Real-time push service in the cloud.
 # coding=utf8
 
 ## PubNub Real-time Push APIs and Notifications Framework
@@ -17,7 +17,7 @@ from Pubnub import Pubnub
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
 ## -----------------------------------------------------------------------
-pubnub = Pubnub( "", "", "", False )
+pubnub = Pubnub("", "", "", False)
 
 ## -----------------------------------------------------------------------
 ## UUID Example
-- 
cgit v1.2.3


From f7b89bfafae34fa22509c1d1c59d1284ec62c5df Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 23 Apr 2014 21:35:06 +0530
Subject: exception handling changes

---
 python-twisted/examples/here-now-example.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
index bba7d21..14f45c4 100644
--- a/python-twisted/examples/here-now-example.py
+++ b/python-twisted/examples/here-now-example.py
@@ -10,7 +10,8 @@
 ## -----------------------------------
 
 import sys
-from twisted.internet import reactor
+sys.path.append('..')
+sys.path.append('../../common')
 from Pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
@@ -32,14 +33,12 @@ crazy = 'hello_world'
 
 def here_now_complete(messages):
     print(messages)
-    reactor.stop()
+    pubnub.stop()
 
-pubnub.here_now({
-    'channel': crazy,
-    'callback': here_now_complete
-})
+pubnub.here_now(
+    channel=crazy, callback=here_now_complete, error=here_now_complete)
 
 ## -----------------------------------------------------------------------
 ## IO Event Loop
 ## -----------------------------------------------------------------------
-reactor.run()
+pubnub.start()
-- 
cgit v1.2.3


From 93379625e26c98a8cfab72c106ae40819843f956 Mon Sep 17 00:00:00 2001
From: Devendra
Date: Thu, 24 Apr 2014 00:35:10 +0530
Subject: remove relative imports

---
 python-twisted/examples/here-now-example.py  | 2 --
 python-twisted/examples/history-example.py   | 1 -
 python-twisted/examples/publish-example.py   | 2 --
 python-twisted/examples/subscribe-example.py | 1 -
 python-twisted/examples/uuid-example.py      | 1 -
 5 files changed, 7 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
index 14f45c4..0f34f36 100644
--- a/python-twisted/examples/here-now-example.py
+++ b/python-twisted/examples/here-now-example.py
@@ -10,8 +10,6 @@
 ## -----------------------------------
 
 import sys
-sys.path.append('..')
-sys.path.append('../../common')
 from Pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
index f128cd7..72c7445 100644
--- a/python-twisted/examples/history-example.py
+++ b/python-twisted/examples/history-example.py
@@ -11,7 +11,6 @@
 
 import sys
 from twisted.internet import reactor
-sys.path.append('../')
 from Pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index 6b5b19a..5d6cc29 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -11,8 +11,6 @@
 
 import sys
 from twisted.internet import reactor
-sys.path.append('../')
-sys.path.append('../../')
 from Pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
index 168a2d2..b261b0d 100644
--- a/python-twisted/examples/subscribe-example.py
+++ b/python-twisted/examples/subscribe-example.py
@@ -11,7 +11,6 @@
 
 import sys
 from twisted.internet import reactor
-sys.path.append('../')
 from Pubnub import Pubnub
 
 publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo'
diff --git a/python-twisted/examples/uuid-example.py b/python-twisted/examples/uuid-example.py
index 581051b..840f48c 100644
--- a/python-twisted/examples/uuid-example.py
+++ b/python-twisted/examples/uuid-example.py
@@ -11,7 +11,6 @@
 
 import sys
 from twisted.internet import reactor
-sys.path.append('../')
 from Pubnub import Pubnub
 
 ## -----------------------------------------------------------------------
-- 
cgit v1.2.3


From c98286f500b77dcf426367df0b688f536b77ea9b Mon Sep 17 00:00:00 2001
From: Devendra
Date: Thu, 24 Apr 2014 01:33:45 +0530
Subject: fixing imports

---
 python-twisted/examples/here-now-example.py  | 2 +-
 python-twisted/examples/history-example.py   | 2 +-
 python-twisted/examples/publish-example.py   | 2 +-
 python-twisted/examples/subscribe-example.py | 2 +-
 python-twisted/examples/uuid-example.py      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
index 0f34f36..4b2965b 100644
--- a/python-twisted/examples/here-now-example.py
+++ b/python-twisted/examples/here-now-example.py
@@ -10,7 +10,7 @@
 ## -----------------------------------
 
 import sys
-from Pubnub import 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-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
index 72c7445..f867a36 100644
--- a/python-twisted/examples/history-example.py
+++ b/python-twisted/examples/history-example.py
@@ -11,7 +11,7 @@
 
 import sys
 from twisted.internet import reactor
-from Pubnub import 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-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
index 5d6cc29..d5af6a5 100644
--- a/python-twisted/examples/publish-example.py
+++ b/python-twisted/examples/publish-example.py
@@ -11,7 +11,7 @@
 
 import sys
 from twisted.internet import reactor
-from Pubnub import 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-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
index b261b0d..3bca615 100644
--- a/python-twisted/examples/subscribe-example.py
+++ b/python-twisted/examples/subscribe-example.py
@@ -11,7 +11,7 @@
 
 import sys
 from twisted.internet import reactor
-from Pubnub import 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-twisted/examples/uuid-example.py b/python-twisted/examples/uuid-example.py
index 840f48c..a745088 100644
--- a/python-twisted/examples/uuid-example.py
+++ b/python-twisted/examples/uuid-example.py
@@ -11,7 +11,7 @@
 
 import sys
 from twisted.internet import reactor
-from Pubnub import Pubnub
+from Pubnub import PubnubTwisted as Pubnub
 
 ## -----------------------------------------------------------------------
 ## Initiate Pubnub State
-- 
cgit v1.2.3


From cf1021b3671fb7537ad7b3a4d577ef0fcace694a Mon Sep 17 00:00:00 2001
From: Devendra
Date: Tue, 6 May 2014 16:43:09 +0530
Subject: modifying examples

---
 python-twisted/examples/here-now-example.py  | 42 ----------------
 python-twisted/examples/here-now.py          | 33 ++++++++++++
 python-twisted/examples/history-example.py   | 46 -----------------
 python-twisted/examples/history.py           | 32 ++++++++++++
 python-twisted/examples/publish-example.py   | 75 ----------------------------
 python-twisted/examples/publish.py           | 33 ++++++++++++
 python-twisted/examples/subscribe-example.py | 50 -------------------
 python-twisted/examples/subscribe.py         | 48 ++++++++++++++++++
 python-twisted/examples/uuid-example.py      | 27 ----------
 9 files changed, 146 insertions(+), 240 deletions(-)
 delete mode 100644 python-twisted/examples/here-now-example.py
 create mode 100644 python-twisted/examples/here-now.py
 delete mode 100644 python-twisted/examples/history-example.py
 create mode 100644 python-twisted/examples/history.py
 delete mode 100644 python-twisted/examples/publish-example.py
 create mode 100644 python-twisted/examples/publish.py
 delete mode 100644 python-twisted/examples/subscribe-example.py
 create mode 100644 python-twisted/examples/subscribe.py
 delete mode 100644 python-twisted/examples/uuid-example.py

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/here-now-example.py b/python-twisted/examples/here-now-example.py
deleted file mode 100644
index 4b2965b..0000000
--- a/python-twisted/examples/here-now-example.py
+++ /dev/null
@@ -1,42 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-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'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
-
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
-pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
-crazy = 'hello_world'
-
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-
-
-def here_now_complete(messages):
-    print(messages)
-    pubnub.stop()
-
-pubnub.here_now(
-    channel=crazy, callback=here_now_complete, error=here_now_complete)
-
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-pubnub.start()
diff --git a/python-twisted/examples/here-now.py b/python-twisted/examples/here-now.py
new file mode 100644
index 0000000..38b79f8
--- /dev/null
+++ b/python-twisted/examples/here-now.py
@@ -0,0 +1,33 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud.
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+
+import sys
+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'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+                secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+channel = 'hello_world'
+
+
+# Asynchronous usage
+
+def callback(message):
+    print(message)
+
+pubnub.here_now(channel, callback=callback, error=callback)
+
+pubnub.start()
diff --git a/python-twisted/examples/history-example.py b/python-twisted/examples/history-example.py
deleted file mode 100644
index f867a36..0000000
--- a/python-twisted/examples/history-example.py
+++ /dev/null
@@ -1,46 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-from twisted.internet import reactor
-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'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
-
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
-pubnub = Pubnub(publish_key, subscribe_key, secret_key, cipher_key, ssl_on)
-crazy = 'hello_world'
-
-## -----------------------------------------------------------------------
-## History Example
-## -----------------------------------------------------------------------
-
-
-def history_complete(messages):
-    print(messages)
-    reactor.stop()
-
-pubnub.history({
-    'channel': crazy,
-    'limit': 10,
-    'callback': history_complete
-})
-
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-reactor.run()
diff --git a/python-twisted/examples/history.py b/python-twisted/examples/history.py
new file mode 100644
index 0000000..10e86b3
--- /dev/null
+++ b/python-twisted/examples/history.py
@@ -0,0 +1,32 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud.
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+
+import sys
+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'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+                secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+channel  = 'a'
+
+# Asynchronous usage
+
+def callback(message):
+    print(message)
+
+pubnub.history(channel, count=2 , callback=callback, error=callback)
+
+pubnub.start()
diff --git a/python-twisted/examples/publish-example.py b/python-twisted/examples/publish-example.py
deleted file mode 100644
index d5af6a5..0000000
--- a/python-twisted/examples/publish-example.py
+++ /dev/null
@@ -1,75 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-from twisted.internet import reactor
-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'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(
-    sys.argv) > 4 and sys.argv[4] or ''  # (Cipher key is Optional)
-auth_key = len(
-    sys.argv) > 5 and sys.argv[5] or 'abcd'  # (Cipher key is Optional)
-ssl_on = len(sys.argv) > 6 and bool(sys.argv[5]) or False
-
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
-pubnub = Pubnub(
-    publish_key, subscribe_key, secret_key, cipher_key, auth_key, ssl_on)
-crazy = 'hello_world'
-
-## -----------------------------------------------------------------------
-## Publish Example
-## -----------------------------------------------------------------------
-
-
-def publish_complete(info):
-    print(info)
-
-
-def publish_error(info):
-    print('ERROR : ' + str(info))
-
-## Publish string
-pubnub.publish({
-    'channel': crazy,
-    'message': 'Hello World!',
-    'callback': publish_complete,
-    'error': publish_error
-})
-
-## Publish list
-li = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday',
-      'Saturday']
-
-pubnub.publish({
-    'channel': crazy,
-    'message': li,
-    'callback': publish_complete,
-    'error': publish_error
-})
-
-
-def done_cb(info):
-    publish_complete(info)
-
-pubnub.publish({
-    'channel': crazy,
-    'message': {'some_key': 'some_val'},
-    'callback': done_cb,
-    'error': publish_error
-})
-
-
-pubnub.start()
diff --git a/python-twisted/examples/publish.py b/python-twisted/examples/publish.py
new file mode 100644
index 0000000..f7b746f
--- /dev/null
+++ b/python-twisted/examples/publish.py
@@ -0,0 +1,33 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud.
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+
+import sys
+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'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+                secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+channel  = 'hello_world'
+message  = 'Hello World !!!'
+
+# Asynchronous usage
+
+def callback(message):
+    print(message)
+
+pubnub.publish(channel, message, callback=callback, error=callback)
+
+pubnub.start()
diff --git a/python-twisted/examples/subscribe-example.py b/python-twisted/examples/subscribe-example.py
deleted file mode 100644
index 3bca615..0000000
--- a/python-twisted/examples/subscribe-example.py
+++ /dev/null
@@ -1,50 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-from twisted.internet import reactor
-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'
-secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
-cipher_key = len(sys.argv) > 4 and sys.argv[4] or None
-ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
-
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
-#pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on )
-pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on)
-crazy = 'hello_world'
-
-## -----------------------------------------------------------------------
-## Subscribe Example
-## -----------------------------------------------------------------------
-
-
-def message_received(message):
-    print(message)
-
-
-def connected():
-    print 'Connected'
-
-pubnub.subscribe({
-    'channel': crazy,
-    'connect': connected,
-    'callback': message_received
-})
-
-## -----------------------------------------------------------------------
-## IO Event Loop
-## -----------------------------------------------------------------------
-reactor.run()
diff --git a/python-twisted/examples/subscribe.py b/python-twisted/examples/subscribe.py
new file mode 100644
index 0000000..1462a69
--- /dev/null
+++ b/python-twisted/examples/subscribe.py
@@ -0,0 +1,48 @@
+## www.pubnub.com - PubNub Real-time push service in the cloud.
+# coding=utf8
+
+## PubNub Real-time Push APIs and Notifications Framework
+## Copyright (c) 2010 Stephen Blum
+## http://www.pubnub.com/
+
+
+import sys
+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'
+secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo'
+cipher_key = len(sys.argv) > 4 and sys.argv[4] or ''
+ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
+
+## -----------------------------------------------------------------------
+## Initiate Pubnub State
+## -----------------------------------------------------------------------
+pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
+                secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
+
+channel  = 'a'
+
+
+
+# Asynchronous usage
+
+def callback(message, channel):
+    print(message)
+
+def error(message):
+    print("ERROR : " + str(message))
+
+def connect(message):
+    print("CONNECTED")
+
+def reconnect(message):
+    print("RECONNECTED")
+
+def disconnect(message):
+    print("DISCONNECTED")
+
+
+pubnub.subscribe(channel, callback=callback, error=callback, connect=connect, reconnect=reconnect, disconnect=disconnect)
+
+pubnub.start()
diff --git a/python-twisted/examples/uuid-example.py b/python-twisted/examples/uuid-example.py
deleted file mode 100644
index a745088..0000000
--- a/python-twisted/examples/uuid-example.py
+++ /dev/null
@@ -1,27 +0,0 @@
-## www.pubnub.com - PubNub Real-time push service in the cloud.
-# coding=utf8
-
-## PubNub Real-time Push APIs and Notifications Framework
-## Copyright (c) 2010 Stephen Blum
-## http://www.pubnub.com/
-
-## -----------------------------------
-## PubNub 3.1 Real-time Push Cloud API
-## -----------------------------------
-
-import sys
-from twisted.internet import reactor
-from Pubnub import PubnubTwisted as Pubnub
-
-## -----------------------------------------------------------------------
-## Initiate Pubnub State
-## -----------------------------------------------------------------------
-pubnub = Pubnub("", "", "", False)
-
-## -----------------------------------------------------------------------
-## UUID Example
-## -----------------------------------------------------------------------
-
-uuid = pubnub.uuid()
-print "UUID: "
-print uuid
-- 
cgit v1.2.3


From 1b49e712e12ba833f460324b95969b162d464edf Mon Sep 17 00:00:00 2001
From: Devendra
Date: Wed, 7 May 2014 12:13:17 +0530
Subject: console changes and pep8 compliance

---
 python-twisted/examples/history.py   |  5 +++--
 python-twisted/examples/publish.py   |  5 +++--
 python-twisted/examples/subscribe.py | 11 +++++++----
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'python-twisted/examples')

diff --git a/python-twisted/examples/history.py b/python-twisted/examples/history.py
index 10e86b3..81974ec 100644
--- a/python-twisted/examples/history.py
+++ b/python-twisted/examples/history.py
@@ -20,13 +20,14 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 ## -----------------------------------------------------------------------
 pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
                 secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
-channel  = 'a'
+channel = 'a'
 
 # Asynchronous usage
 
+
 def callback(message):
     print(message)
 
-pubnub.history(channel, count=2 , callback=callback, error=callback)
+pubnub.history(channel, count=2, callback=callback, error=callback)
 
 pubnub.start()
diff --git a/python-twisted/examples/publish.py b/python-twisted/examples/publish.py
index f7b746f..13b5357 100644
--- a/python-twisted/examples/publish.py
+++ b/python-twisted/examples/publish.py
@@ -20,11 +20,12 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 ## -----------------------------------------------------------------------
 pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
                 secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
-channel  = 'hello_world'
-message  = 'Hello World !!!'
+channel = 'hello_world'
+message = 'Hello World !!!'
 
 # Asynchronous usage
 
+
 def callback(message):
     print(message)
 
diff --git a/python-twisted/examples/subscribe.py b/python-twisted/examples/subscribe.py
index 1462a69..9c73439 100644
--- a/python-twisted/examples/subscribe.py
+++ b/python-twisted/examples/subscribe.py
@@ -21,28 +21,31 @@ ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False
 pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key,
                 secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on)
 
-channel  = 'a'
-
+channel = 'a'
 
 
 # Asynchronous usage
-
 def callback(message, channel):
     print(message)
 
+
 def error(message):
     print("ERROR : " + str(message))
 
+
 def connect(message):
     print("CONNECTED")
 
+
 def reconnect(message):
     print("RECONNECTED")
 
+
 def disconnect(message):
     print("DISCONNECTED")
 
 
-pubnub.subscribe(channel, callback=callback, error=callback, connect=connect, reconnect=reconnect, disconnect=disconnect)
+pubnub.subscribe(channel, callback=callback, error=callback,
+                 connect=connect, reconnect=reconnect, disconnect=disconnect)
 
 pubnub.start()
-- 
cgit v1.2.3