1
1
import json
2
- import urllib2
2
+ import urllib . request , urllib . error , urllib . parse
3
3
4
4
ALLOWED_KEYS = [
5
5
'fsym' ,
8
8
'tsyms' ,
9
9
'ts' ,
10
10
'e' ,
11
+ 'limit' ,
11
12
'markets' ,
12
13
'extraParams' ,
13
14
'sign' ,
15
+ 'tots' ,
16
+ 'toTs' ,
14
17
'tryConversion' ,
15
18
'calculationType'
16
19
]
17
20
18
21
def _is_params_valid (self , ** kwargs ):
19
22
20
- for key ,value in kwargs .items ():
23
+ for key ,value in list ( kwargs .items () ):
21
24
if (value == None or value == '' ):
22
25
raise ValueError (key + ' cannot be empty!' )
23
26
@@ -28,7 +31,7 @@ def _fetch_data(self, url):
28
31
29
32
print ('Calling URL - ' + url )
30
33
31
- json_response = json .load (urllib2 .urlopen (url ))
34
+ json_response = json .load (urllib . request .urlopen (url ))
32
35
33
36
if 'Response' in json_response and json_response ["Response" ] == 'Error' :
34
37
raise ValueError ("API Error - {} !" .format (json_response ['Message' ]))
@@ -43,7 +46,7 @@ def _get_querystring(self, kwargs):
43
46
44
47
if kwargs is not None :
45
48
46
- for key ,value in kwargs .items ():
49
+ for key ,value in list ( kwargs .items () ):
47
50
48
51
if key == "fsym" or key == "fsyms" :
49
52
fsym = value
@@ -53,4 +56,4 @@ def _get_querystring(self, kwargs):
53
56
if key in ALLOWED_KEYS :
54
57
querystring = "{}&{}" .format (querystring , "{}={}" .format (key , value ))
55
58
56
- return fsym , tsym , querystring
59
+ return fsym , tsym , querystring + '&apikey=' + self . apikey
0 commit comments