rquote 0.3.3__py3-none-any.whl → 0.3.4__py3-none-any.whl

rquote/main.py

@@ -218,6 +218,8 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                 d = json.loads(hget(url).text)['result']['data'].split('|')
                 d = pd.DataFrame([i.split(',') for i in d], 
                                  columns=['date', 'open', 'high', 'low', 'close', 'vol', 'amount'])
+                for col in ['open','high','low','close','vol','amount']:
+                    d[col] = pd.to_numeric(d[col], errors='coerce')
                 return i, 'BTC', d
             else:
                 ix = i[2:]
@@ -227,6 +229,8 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                     # d = pd.DataFrame(json.loads(rtext.split(i[2:])[1][2:-2]))
                     d = pd.DataFrame(load_js_var_json(url))
                     d.columns = ['dtime', 'close', 'avg', 'vol', 'hold','last_close','cur_date']
+                    for col in ['close','avg','vol','hold']:
+                        d[col] = pd.to_numeric(d[col], errors='coerce')
                     d = d.set_index(['dtime'])
                     return i[2:], i[2:], d
                 else:
@@ -234,6 +238,8 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                     #         ix, ix)).text.split('(')[1][:-2]))
                     d = pd.DataFrame(load_js_var_json(sina_future_d.format(ix, ix)))
                     d.columns = ['date', 'open', 'high', 'low', 'close', 'vol', 'p', 's']
+                    for col in ['open','high','low','close','vol','p','s']:
+                        d[col] = pd.to_numeric(d[col], errors='coerce')
             d = d.set_index(['date']).astype(float)
             # d.index = pd.DatetimeIndex(d.index)
             return i, ix, d
@@ -260,7 +266,9 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
         a = json.loads(a.text.split('=')[1])['data'][i]
         nm = a['qt'][i][1]
         b = pd.DataFrame([i.split() for i in a['data']['data']],
-        columns=['minute','price','volume']).set_index(['minute']).astype(str)
+                columns=['minute','price','volume']).set_index(['minute'])
+        for col in ['price','volume']:
+            b[col] = pd.to_numeric(b[col], errors='coerce')
         return i, nm, b
     a = json.loads(a.text)['data'][i]
     name = ''
@@ -271,12 +279,10 @@ def get_price(i, sdate='', edate='', freq='day', days=320, fq='qfq',
                 tk = tkt
                 break
         b = pd.DataFrame([j[:6] for j in a[tk]],
-                         columns=['date',
-                                  'open',
-                                  'close',
-                                  'high',
-                                  'low',
-                                  'vol']).set_index(['date']).astype(float)
+                         columns=['date','open','close','high','low','vol']
+                         ).set_index(['date'])
+        for col in ['open','high','low','close','vol']:
+            b[col] = pd.to_numeric(b[col], errors='coerce')
         if 'qt' in a:
             name = a['qt'][i][1]
     except Exception as e:

{rquote-0.3.3.dist-info → rquote-0.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rquote
-Version: 0.3.3
+Version: 0.3.4
 Summary: Mostly day quotes of cn/hk/us/fund/future markets, side with quote list fetch
 Requires-Python: >=3.6.1
 Description-Content-Type: text/markdown

rquote-0.3.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+rquote/__init__.py,sha256=PB620yEq2QZyfDweKY_8qMEsZMKhskGfhmfDkch_0j0,462
+rquote/main.py,sha256=HFSRvUrWOo6tmZNpyWuIlGF0p32SgYyrwmjmIQyLQNg,20452
+rquote/plots.py,sha256=N8uvD6ju9tow0DllPQiXiM7EoPC2bK8X7QF6NQainKs,2342
+rquote/utils.py,sha256=4Neb9_R-EKAd6s1Qj4O_vs9jXWyvroxEEhdqH35vxVE,6808
+rquote-0.3.4.dist-info/METADATA,sha256=txSHL6ckkJkLgz5OomCVp469GGX3rb15mN9jqPrqnY0,7301
+rquote-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rquote-0.3.4.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
+rquote-0.3.4.dist-info/RECORD,,

rquote-0.3.3.dist-info/RECORD

@@ -1,8 +0,0 @@
-rquote/__init__.py,sha256=PB620yEq2QZyfDweKY_8qMEsZMKhskGfhmfDkch_0j0,462
-rquote/main.py,sha256=6o-eBvjUoUKLLPRxL6gkXbOje8y3tBlgjrVKz68GD-8,19982
-rquote/plots.py,sha256=N8uvD6ju9tow0DllPQiXiM7EoPC2bK8X7QF6NQainKs,2342
-rquote/utils.py,sha256=4Neb9_R-EKAd6s1Qj4O_vs9jXWyvroxEEhdqH35vxVE,6808
-rquote-0.3.3.dist-info/METADATA,sha256=FNkt0vuPh7Zxs5D_VepHEtvEx6g49i0FnAZ6veSE5aM,7301
-rquote-0.3.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rquote-0.3.3.dist-info/top_level.txt,sha256=CehAiaZx7Fo8HGoV2zd5GhILUW1jQEN8YS-cWMlrK9Y,7
-rquote-0.3.3.dist-info/RECORD,,