revise codes, README.md to be more 'pratical'

Author: Wasin Waeosri

README.md

@@ -30,7 +30,7 @@ $>python <application>.py
 ```
 
 ## Optional - How to install requests
-The best way is to get the pip package management tool 
+The best way is via the pip package management tool 
 1. export <Python_folder>\Scripts to your OS PATH environment
 2. call pip command to install requests
 	```
@@ -75,4 +75,7 @@ You can modify the scripts to run with Python 3 (with requests library installed
 	- revies README.md
 	- modify trkd_authen.py
 	- modify trkd_quote.py
+- version 1.0.7: 9 May 2017
+	- revies README.md
+	- modify the rest of application files
 

trkd_chart.py

@@ -15,7 +15,7 @@
 import getpass
 import urllib2
 
-
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:

trkd_interday.py

@@ -14,7 +14,7 @@
 import json
 import getpass
 
-
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:

trkd_intraday.py

@@ -14,7 +14,7 @@
 import json
 import getpass
 
-
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:

trkd_newsheadline.py

@@ -13,6 +13,7 @@
 import json
 import getpass
 
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:

trkd_newsstory.py

@@ -13,7 +13,7 @@
 import json
 import getpass
 
-
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:

trkd_onlinereport.py

@@ -13,71 +13,81 @@
 import json
 import getpass
 
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try:
-        ##send request
-        result = requests.post(url, data=json.dumps(requestMsg), headers=headers)
-        if result.status_code == 500:
-            print 'Request fail'
-            print 'response status %s' % result.status_code
-            print 'Error: %s' % result.json()
-            sys.exit(1)
+        # send request
+        result = requests.post(
+            url, data=json.dumps(requestMsg), headers=headers)
+        # handle error
+        if result.status_code is not 200:
+            print('Request fail')
+            print('response status %s' % (result.status_code))
+            if result.status_code == 500:  # if username or password or appid is wrong
+                print('Error: %s' % (result.json()))
+            result.raise_for_status()
     except requests.exceptions.RequestException, e:
-        print 'Exception!!!'
-        print e
+        print('Exception!!!')
+        print(e)
         sys.exit(1)
     return result
 
 
-## Perform authentication
+# Perform authentication
 def CreateAuthorization(username, password, appid):
     token = None
-    ##create authentication request URL, message and header
-    authenMsg = {'CreateServiceToken_Request_1': { 'ApplicationID':appid, 'Username':username,'Password':password }}
+    # create authentication request URL, message and header
+    authenMsg = {'CreateServiceToken_Request_1': {
+        'ApplicationID': appid, 'Username': username, 'Password': password}}
     authenURL = 'https://api.trkd.thomsonreuters.com/api/TokenManagement/TokenManagement.svc/REST/Anonymous/TokenManagement_1/CreateServiceToken_1'
     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:
-        print 'Authen success'
-        print 'response status %s'%(authenResult.status_code)
-        ##get Token
+        print('Authen success')
+        print('response status %s' % (authenResult.status_code))
+        # get Token
         token = authenResult.json()['CreateServiceToken_Response_1']['Token']
-    
+
     return token
 
-## Perform Online Report request 
+# Perform Online Report request
+
+
 def RetrieveOnlineReport(token, appid):
-    ##construct Online Report URL and header
+    # construct Online Report URL and header
     onlinereportURL = 'http://api.rkd.reuters.com/api/OnlineReports/OnlineReports.svc/REST/OnlineReports_1/GetSummaryByTopic_1'
-    headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
-    ##construct a Online Report request message
+    headers = {'content-type': 'application/json;charset=utf-8',
+               'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token': token}
+    # construct a Online Report request message
     onelinereportRequestMsg = {'GetSummaryByTopic_Request_1': {
         'Topic': 'OLRUTOPNEWS',
         'MaxCount': 20,
         'ReturnPrivateNetworkURL': False
-        }
     }
-    print '############### Sending News - Online Report request message to TRKD ###############'
-    onlinereportResult = doSendRequest(onlinereportURL, onelinereportRequestMsg,headers)
+    }
+    print('############### Sending News - Online Report request message to TRKD ###############')
+    onlinereportResult = doSendRequest(
+        onlinereportURL, onelinereportRequestMsg, headers)
     if onlinereportResult is not None and onlinereportResult.status_code == 200:
-        print 'Online Report response message: '
-        print onlinereportResult.json()
+        print('Online Report response message: ')
+        print(onlinereportResult.json())
 
 
 
 ## ------------------------------------------ Main App ------------------------------------------ ##
-##Get username, password and applicationid
-username = raw_input('Please input username: ')
-##use getpass.getpass to hide user inputted password
-password = getpass.getpass(prompt='Please input password: ')
-appid = raw_input('Please input appid: ')
 
-token = CreateAuthorization(username,password,appid)
-print 'Token = %s'%(token)
+if __name__ == '__main__':
+    # Get username, password and applicationid
+    username = raw_input('Please input username: ')
+    # use getpass.getpass to hide user inputted password
+    password = getpass.getpass(prompt='Please input password: ')
+    appid = raw_input('Please input appid: ')
 
-## if authentiacation success, continue subscribing Online Report
-if token is not None:
-    RetrieveOnlineReport(token,appid)
+    token = CreateAuthorization(username, password, appid)
+    print 'Token = %s' % (token)
 
+    # if authentiacation success, continue subscribing Online Report
+    if token is not None:
+        RetrieveOnlineReport(token, appid)

trkd_quote.py

@@ -14,7 +14,7 @@
 import json
 import getpass
 
-
+# Send HTTP request for all services
 def doSendRequest(url, requestMsg, headers):
     result = None
     try: