Change log:

1. Remove all is not None statements, change them to be a bit more Pythonic

Author: Wasin Waeosri

README.md

@@ -75,3 +75,5 @@ The best way is via the pip package management tool
 	- Fix the issue that some scripts still send request message to the old REST endpoint.
 - version 1.0.9: 26 Jan 2018
 	- Add debug log for checking outgoing message (disabled by default)
+- version 1.0.10: 9 Aug 2018
+	- remove all ```is not None``` statements and make them a bit more **Pythonic**

trkd_chart.py

@@ -320,10 +320,10 @@ def downloadChartImage(chartURL):
     token = CreateAuthorization(username,password,appid)
     print('Token = %s'%(token))
     ## if authentiacation success, continue subscribing Chart
-    if token is not None:
+    if token:
         chartURL = RetrieveChart(token,appid)
         ## if chart request success, continue downloading Chart image
-        if chartURL is not None:
+        if chartURL:
             print('############### Downloading Chart file from TRKD ###############')
             downloadChartImage(chartURL)
 

trkd_interday.py

@@ -44,7 +44,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s'%(authenResult.status_code))
         ##get Token
@@ -81,7 +81,7 @@ def RetrieveInteraday(token, appid):
 
     print('############### Sending Time Series Interday request message to TRKD ###############')
     interdayResult = doSendRequest(interdayURL, interdayRequestMsg, headers)
-    if interdayResult is not None and interdayResult.status_code == 200:
+    if interdayResult and interdayResult.status_code == 200:
         print('Time Series Interday response message: ')
         print(interdayResult.json())
 

trkd_intraday.py

@@ -48,7 +48,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s' % (authenResult.status_code))
         # get Token
@@ -90,7 +90,7 @@ def RetrieveIntraday(token, appid):
 
     print('############### Sending Time Series Intraday request message to TRKD ###############')
     intradayResult = doSendRequest(intradayURL, intradayRequestMsg, headers)
-    if intradayResult is not None and intradayResult.status_code == 200:
+    if intradayResult and intradayResult.status_code == 200:
         print('Time Series Intraday response message: ')
         print(intradayResult.json())
 
@@ -106,5 +106,5 @@ def RetrieveIntraday(token, appid):
     token = CreateAuthorization(username, password, appid)
     print('Token = %s' % (token))
     # if authentiacation success, continue subscribing Time Series intraday
-    if token is not None:
+    if token:
         RetrieveIntraday(token, appid)

trkd_newsheadline.py

@@ -43,7 +43,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s'%(authenResult.status_code))
         ##get Token
@@ -76,7 +76,7 @@ def RetrieveNewsHeadline(token, appid):
 
     print('############### Sending News Headline request message to TRKD ###############')
     newsResult = doSendRequest(newsURL, newsRequestMsg,headers)
-    if newsResult is not None and newsResult.status_code == 200:
+    if newsResult and newsResult.status_code == 200:
         print('News Headline response message: ')
         print(newsResult.json())
 
@@ -95,5 +95,5 @@ def RetrieveNewsHeadline(token, appid):
     print('Token = %s'%(token))
 
     ## if authentiacation success, continue subscribing News Headline
-    if token is not None:
+    if token:
         RetrieveNewsHeadline(token,appid)

trkd_newsstory.py

@@ -45,7 +45,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s' % (authenResult.status_code))
         # get Token
@@ -69,7 +69,7 @@ def RetrieveNewsStory(token, appid):
 
     print('############### Sending News Story request message to TRKD ###############')
     newsResult = doSendRequest(newsURL, newsRequestMsg, headers)
-    if newsResult is not None and newsResult.status_code == 200:
+    if newsResult and newsResult.status_code == 200:
         print('News Story response message: ')
         print(newsResult.json())
 
@@ -88,5 +88,5 @@ def RetrieveNewsStory(token, appid):
     print('Token = %s' % (token))
 
     # if authentiacation success, continue subscribing News Story
-    if token is not None:
+    if token:
         RetrieveNewsStory(token, appid)

trkd_onlinereport.py

@@ -45,7 +45,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s' % (authenResult.status_code))
         # get Token
@@ -71,7 +71,7 @@ def RetrieveOnlineReport(token, appid):
     print('############### Sending News - Online Report request message to TRKD ###############')
     onlinereportResult = doSendRequest(
         onlinereportURL, onelinereportRequestMsg, headers)
-    if onlinereportResult is not None and onlinereportResult.status_code == 200:
+    if onlinereportResult and onlinereportResult.status_code == 200:
         print('Online Report response message: ')
         print(onlinereportResult.json())
 
@@ -90,5 +90,5 @@ def RetrieveOnlineReport(token, appid):
     print('Token = %s' % (token))
 
     # if authentiacation success, continue subscribing Online Report
-    if token is not None:
+    if token:
         RetrieveOnlineReport(token, appid)

trkd_quote.py

@@ -49,7 +49,7 @@ def CreateAuthorization(username, password, appid):
     headers = {'content-type': 'application/json;charset=utf-8'}
     print('############### Sending Authentication request message to TRKD ###############')
     authenResult = doSendRequest(authenURL, authenMsg, headers)
-    if authenResult is not None and authenResult.status_code == 200:
+    if authenResult and authenResult.status_code == 200:
         print('Authen success')
         print('response status %s'%(authenResult.status_code))
         ##get Token
@@ -87,7 +87,7 @@ def RetrieveQuotes(token, appid):
 
     print('############### Sending Quote request message to TRKD ###############')
     quoteResult = doSendRequest(quoteURL, quoteRequestMsg,headers)
-    if quoteResult is not None and quoteResult.status_code == 200:
+    if quoteResult and quoteResult.status_code == 200:
         print('Quote response message: ')
         print(quoteResult.json())
 
@@ -104,5 +104,5 @@ def RetrieveQuotes(token, appid):
     token = CreateAuthorization(username,password,appid)
     print('Token = %s'%(token))
     ## if authentiacation success, continue subscribing Quote
-    if token is not None:
+    if token:
         RetrieveQuotes(token,appid)