Merge branch 'v14_python2'

1.Update code style to close Python3
2. Fix outdated TRKD REST endpoints

Author: Wasin Waeosri

README.md

@@ -21,7 +21,7 @@ The following softwares are required to use this script
 - Python 2.7
 - The [requests](http://docs.python-requests.org/en/master/) library
 
-The scripts are based on Python 2 but you can modify it to run with Python 3 (see "Optional - How to run with Python 3" section).
+The scripts support Python 2 only, not Python 3.
 
 ## How to run the script
 Run the script via the command line (or shell)
@@ -41,16 +41,6 @@ The best way is via the pip package management tool
 	export https_proxy="http://<proxy.server>:<port>"
 	$>pip install requests
 	```
-## Optional - How to run with Python 3
-You can modify the scripts to run with Python 3 (with requests library installed) by just change the code from "**raw_input()**" to "**input()**" as the following example
-- Python 2
-```
-username = raw_input('Please input username: ')
-```
-- Python 3
-```
-username = input('Please input username: ')
-```
 
 ## Release Note
 - Version 1: 6 Sep 2016

trkd_chart.py

@@ -28,7 +28,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -274,7 +274,7 @@ def RetrieveChart(token, appid):
     'ReturnPrivateNetworkURL': False,
     }}}
     ##construct Chart URL and header
-    chartURL = 'http://api.rkd.reuters.com/api/Charts/Charts.svc/REST/Charts_1/GetChart_2BB'
+    chartURL = 'http://api.trkd.thomsonreuters.com/api/Charts/Charts.svc/REST/Charts_1/GetChart_2'
     headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
 
     print('############### Sending Chart request message to TRKD ###############')

trkd_interday.py

@@ -27,7 +27,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -74,7 +74,7 @@ def RetrieveInteraday(token, appid):
         }
     }
     ##construct Time Series Interday URL and header
-    interdayURL = 'http://api.rkd.reuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'
+    interdayURL = 'http://api.trkd.thomsonreuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetInterdayTimeSeries_4'
     headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
 
     print('############### Sending Time Series Interday request message to TRKD ###############')

trkd_intraday.py

@@ -27,7 +27,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -74,7 +74,7 @@ def RetrieveIntraday(token, appid):
         }
     }
     ##construct Time Series Intraday URL and header
-    intradayURL = 'http://api.rkd.reuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetIntradayTimeSeries_4'
+    intradayURL = 'http://api.trkd.thomsonreuters.com/api/TimeSeries/TimeSeries.svc/REST/TimeSeries_1/GetIntradayTimeSeries_4'
     headers = {'content-type': 'application/json;charset=utf-8' ,'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token' : token}
 
     print('############### Sending Time Series Intraday request message to TRKD ###############')

trkd_newsheadline.py

@@ -26,7 +26,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -40,7 +40,7 @@ def CreateAuthorization(username, password, appid):
     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 ###############'
+    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')

trkd_newsstory.py

@@ -27,7 +27,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -42,7 +42,7 @@ def CreateAuthorization(username, password, appid):
         '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 ###############'
+    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')
@@ -55,7 +55,7 @@ def CreateAuthorization(username, password, appid):
 # Perform News Story request
 def RetrieveNewsStory(token, appid):
     # construct news story URL and header
-    newsURL = 'http://api.rkd.reuters.com/api/News/News.svc/REST/News_1/RetrieveStoryML_1'
+    newsURL = 'http://api.trkd.thomsonreuters.com/api/News/News.svc/REST/News_1/RetrieveStoryML_1'
     headers = {'content-type': 'application/json;charset=utf-8',
                'X-Trkd-Auth-ApplicationID': appid, 'X-Trkd-Auth-Token': token}
     # construct a news story request message

trkd_onlinereport.py

@@ -27,7 +27,7 @@ def doSendRequest(url, requestMsg, headers):
             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:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)
@@ -57,7 +57,7 @@ def CreateAuthorization(username, password, appid):
 
 def RetrieveOnlineReport(token, appid):
     # construct Online Report URL and header
-    onlinereportURL = 'http://api.rkd.reuters.com/api/OnlineReports/OnlineReports.svc/REST/OnlineReports_1/GetSummaryByTopic_1'
+    onlinereportURL = 'http://api.trkd.thomsonreuters.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
@@ -86,7 +86,7 @@ def RetrieveOnlineReport(token, appid):
     appid = raw_input('Please input appid: ')
 
     token = CreateAuthorization(username, password, appid)
-    print 'Token = %s' % (token)
+    print('Token = %s' % (token))
 
     # if authentiacation success, continue subscribing Online Report
     if token is not None:

trkd_quote.py

@@ -32,7 +32,7 @@ def doSendRequest(url, requestMsg, headers):
             #print('response status %s' % result.status_code)
             #print('Error: %s' % result.json())
             #sys.exit(1)
-    except requests.exceptions.RequestException, e:
+    except requests.exceptions.RequestException as e:
         print('Exception!!!')
         print(e)
         sys.exit(1)