add brackets to print

fendouai · fendouai · commit ca2cb59ac54f · 2016-05-19T11:26:36.000+08:00
diff --git a/README.md b/README.md
@@ -52,9 +52,9 @@ except common.Unauthorized:
 except common.APIConnectionException:
     raise common.APIConnectionException("conn error")
 except common.JPushFailure:
-    print "JPushFailure"
+    print ("JPushFailure")
 except:
-    print "Exception"
+    print ("Exception")
 ```
 ## 日志说明
 logging level 默认的是 WARNING ，为了方便调试建议设置为 DEBUG
diff --git a/examples/__init__.py b/examples/__init__.py
@@ -1,2 +1,7 @@
 """Python package for using the JPush API"""
 from .conf import app_key, master_secret
+
+__all__ = [
+    app_key,
+    master_secret,
+]
diff --git a/examples/device_examples/conf.py b/examples/device_examples/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/examples/device_examples/example_aliasuser.py b/examples/device_examples/example_aliasuser.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_clrtag.py b/examples/device_examples/example_clrtag.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_getdevice.py b/examples/device_examples/example_getdevice.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_rmalias.py b/examples/device_examples/example_rmalias.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_rmtag.py b/examples/device_examples/example_rmtag.py
@@ -1,7 +1,7 @@
 #-*- encoding:utf-8 -*-
 
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_tagexist.py b/examples/device_examples/example_tagexist.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_taglist.py b/examples/device_examples/example_taglist.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_tagupduser.py b/examples/device_examples/example_tagupduser.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/device_examples/example_updevice.py b/examples/device_examples/example_updevice.py
@@ -1,10 +1,10 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
 reg_id = '1507bfd3f7c466c355c'
 entity = jpush.device_tag(jpush.add("ddd", "tageee"))
 result=device.set_devicemobile(reg_id, entity)
-print result.status_code
-print result.payload
+print (result.status_code)
+print (result.payload)
diff --git a/examples/device_examples/example_updevicemobile.py b/examples/device_examples/example_updevicemobile.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 device = _jpush.create_device()
diff --git a/examples/push_examples/conf.py b/examples/push_examples/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/examples/push_examples/example_all.py b/examples/push_examples/example_all.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 from jpush import common
 
 _jpush = jpush.JPush(app_key, master_secret)
diff --git a/examples/push_examples/example_audience.py b/examples/push_examples/example_audience.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
@@ -9,5 +9,5 @@
         )
 push.notification = jpush.notification(alert="Hello world with audience!")
 push.platform = jpush.all_
-print push.payload
+print (push.payload)
 push.send()
diff --git a/examples/push_examples/example_options.py b/examples/push_examples/example_options.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
diff --git a/examples/push_examples/example_platformmsg.py b/examples/push_examples/example_platformmsg.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
diff --git a/examples/push_examples/example_silent.py b/examples/push_examples/example_silent.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
diff --git a/examples/push_examples/example_sms.py b/examples/push_examples/example_sms.py
@@ -1,11 +1,11 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
 push.audience = jpush.all_
 push.notification = jpush.notification(alert="a sms message from python jpush api")
 push.platform = jpush.all_
 push.smsmessage=jpush.smsmessage("a sms message from python jpush api",0)
-print push.payload
+print (push.payload)
 push.send()
diff --git a/examples/push_examples/example_validate.py b/examples/push_examples/example_validate.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 push = _jpush.create_push()
diff --git a/examples/report_examples/conf.py b/examples/report_examples/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/examples/report_examples/example_messages.py b/examples/report_examples/example_messages.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 report=_jpush.create_report();
diff --git a/examples/report_examples/example_received.py b/examples/report_examples/example_received.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 report=_jpush.create_report();
diff --git a/examples/report_examples/example_users.py b/examples/report_examples/example_users.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 report=_jpush.create_report();
diff --git a/examples/schedule_examples/conf.py b/examples/schedule_examples/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/examples/schedule_examples/example_delete_schedule.py b/examples/schedule_examples/example_delete_schedule.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 schedule = _jpush.create_schedule()
diff --git a/examples/schedule_examples/example_get_schedule.py b/examples/schedule_examples/example_get_schedule.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 schedule = _jpush.create_schedule()
diff --git a/examples/schedule_examples/example_get_schedule_list.py b/examples/schedule_examples/example_get_schedule_list.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 schedule = _jpush.create_schedule()
diff --git a/examples/schedule_examples/example_post_schedule.py b/examples/schedule_examples/example_post_schedule.py
@@ -1,6 +1,6 @@
 import jpush as jpush
 
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 schedule = _jpush.create_schedule()
@@ -14,4 +14,4 @@
 trigger=jpush.schedulepayload.trigger("2016-07-17 12:00:00")
 schedulepayload=jpush.schedulepayload.schedulepayload("name",True,trigger,push)
 result=schedule.post_schedule(schedulepayload)
-print result.status_code
+print (result.status_code)
diff --git a/examples/schedule_examples/example_put_schedule.py b/examples/schedule_examples/example_put_schedule.py
@@ -1,5 +1,5 @@
 import jpush as jpush
-from examples.conf import app_key, master_secret
+from conf import app_key, master_secret
 _jpush = jpush.JPush(app_key, master_secret)
 _jpush.set_logging("DEBUG")
 schedule = _jpush.create_schedule()
diff --git a/tests/devices/conf.py b/tests/devices/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/tests/push/conf.py b/tests/push/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/tests/push/test_audience.py b/tests/push/test_audience.py
@@ -28,7 +28,7 @@ def test_audience(self):
         push.platform = jpush.all_
         try:
             response = push.send()
-            print response.status_code
+
             self.assertEqual(response.status_code, 200)
         except common.Unauthorized, e:
             self.assertFalse(isinstance(e, common.Unauthorized))
@@ -38,7 +38,7 @@ def test_audience(self):
             raise common.APIConnectionException("conn")
         except common.JPushFailure, e:
             self.assertFalse(isinstance(e, common.JPushFailure))
-            print "JPushFailure"
+            print ("JPushFailure")
         except:
             self.assertFalse(1)
-            print "Exception"
+            print ("Exception")
diff --git a/tests/push/test_message.py b/tests/push/test_message.py
@@ -42,7 +42,6 @@ def test_push(self):
         push.platform = jpush.all_
         try:
             response = push.send()
-            print response.status_code
             self.assertEqual(response.status_code, 200)
         except common.Unauthorized, e:
             self.assertFalse(isinstance(e, common.Unauthorized))
@@ -52,7 +51,7 @@ def test_push(self):
             raise common.APIConnectionException("conn")
         except common.JPushFailure, e:
             self.assertFalse(isinstance(e, common.JPushFailure))
-            print "JPushFailure"
+            print ("JPushFailure")
         except:
             self.assertFalse(1)
-            print "Exception"
+            print ("Exception")
diff --git a/tests/report/conf.py b/tests/report/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/tests/report/test_report.py b/tests/report/test_report.py
@@ -24,6 +24,5 @@ def test_get_schedule_by_invalid_id(self):
             result = report.get_users("DAY","2016-04-10","3")
             self.assertEqual(result.status_code, 200)
         except common.JPushFailure, e:
-            print e
             self.assertIsInstance(e, common.JPushFailure)
 
diff --git a/tests/schedule/conf.py b/tests/schedule/conf.py
@@ -0,0 +1,3 @@
+# please put your app_key and master_secret here
+app_key = u'6be9204c30b9473e87bad4dc'
+master_secret = u'9349ad7c90292a603c512e92'
diff --git a/tests/schedule/test_schedule.py b/tests/schedule/test_schedule.py
@@ -38,7 +38,6 @@ def test_get_schedule_by_invalid_id(self):
             result = schedule.get_schedule_by_id("3fc6e2fa-15a6-11e6-83d4-0021f653c222")
             self.assertNotEqual(result.status_code, 200)
         except common.JPushFailure, e:
-            print e
             self.assertIsInstance(e, common.JPushFailure)
 
     def test_get_schedule_list(self):
@@ -71,6 +70,5 @@ def test_delete_schedule(self):
             result = schedule.delete_schedule("e9c553d0-0850-11e6-b6d4-0021f652c102")
             self.assertNotEqual(result.status_code, 200)
         except common.JPushFailure, e:
-            print e
             self.assertIsInstance(e, common.JPushFailure)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# please put your app_key and master_secret here`
	`2`	`+app_key = u'6be9204c30b9473e87bad4dc'`
	`3`	`+master_secret = u'9349ad7c90292a603c512e92'`