Selaa lähdekoodia

Code cleanup: Camel Casing quandl method names

David Leonard 10 vuotta sitten
vanhempi
commit
8af2aef115

+ 6 - 7
hackathon_starter/hackathon/scripts/quandl.py

@@ -4,27 +4,26 @@ aggregating data from markets throughout the world'''
 import requests
 import requests
 import simplejson as json
 import simplejson as json
 
 
-APIKEY = ' fANs6ykrCdAxas7zpMz7'
 
 
-def dowjonesindustrialavg(APIKEY):
+def dowjonesIndustrialAvg(apikey):
     '''Returns JSON data of the Dow Jones Average.'''
     '''Returns JSON data of the Dow Jones Average.'''
-    parameters = {'rows' : 1, 'auth_token' : APIKEY}
+    parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
     reap = requests.get(apiurl, params=parameters)
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
     desu = json.loads(reap.content)
     return desu['data']
     return desu['data']
 
 
-def snp500indexpull(APIKEY):
+def snp500IndexPull(apikey):
     '''Returns JSON data of the S&P 500 Index.'''
     '''Returns JSON data of the S&P 500 Index.'''
-    parameters = {'rows' : 1, 'auth_token' : APIKEY}
+    parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/YAHOO/INDEX_GSPC.json?'
     apiurl = 'https://www.quandl.com/api/v1/datasets/YAHOO/INDEX_GSPC.json?'
     reap = requests.get(apiurl, params=parameters)
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
     desu = json.loads(reap.content)
     return desu['data']
     return desu['data']
 
 
-def nasdaqpull(APIKEY):
+def nasdaqPull(apikey):
     '''Returns JSON data of the Nasdaq Index.'''
     '''Returns JSON data of the Nasdaq Index.'''
-    parameters = {'rows' : 1, 'auth_token' : APIKEY}
+    parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/GOOG/NASDAQ_SWTX.json?'
     apiurl = 'https://www.quandl.com/api/v1/datasets/GOOG/NASDAQ_SWTX.json?'
     reap = requests.get(apiurl, params=parameters)
     reap = requests.get(apiurl, params=parameters)
     desu = json.loads(reap.content)
     desu = json.loads(reap.content)

+ 4 - 3
hackathon_starter/hackathon/views.py

@@ -81,22 +81,23 @@ def facebook(request):
 #################
 #################
 #   QUANDL API  #
 #   QUANDL API  #
 #################
 #################
+
 def quandldowjones(request):
 def quandldowjones(request):
     '''Returns JSON response about the latest dowjones index.'''
     '''Returns JSON response about the latest dowjones index.'''
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
-    parsedData = dowjonesindustrialavg(APIKEY)
+    parsedData = dowjonesIndustrialAvg(APIKEY)
     return JsonResponse({'data': parsedData})
     return JsonResponse({'data': parsedData})
 
 
 def quandlsnp500(request):
 def quandlsnp500(request):
     '''Returns JSON response about the latest SNP 500 index.'''
     '''Returns JSON response about the latest SNP 500 index.'''
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
-    parsedData = snp500indexpull(APIKEY)
+    parsedData = snp500IndexPull(APIKEY)
     return JsonResponse({'data': parsedData})
     return JsonResponse({'data': parsedData})
 
 
 def quandlnasdaq(request):
 def quandlnasdaq(request):
     '''Returns JSON response about the latest nasdaq index.'''
     '''Returns JSON response about the latest nasdaq index.'''
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
     APIKEY = ' fANs6ykrCdAxas7zpMz7'
-    parsedData = nasdaqpull(APIKEY)
+    parsedData = nasdaqPull(APIKEY)
     return JsonResponse({'data': parsedData})
     return JsonResponse({'data': parsedData})
 
 
 #################
 #################