Skip to content

Commit

Permalink
Merge branch 'rc'
Browse files Browse the repository at this point in the history
  • Loading branch information
toomore committed Apr 1, 2012
2 parents 633b93c + e82bbe6 commit 62235b6
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 7 deletions.
8 changes: 7 additions & 1 deletion README.rest
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ grs 台灣上市股票價格擷取
-----------------------------

:Authors: Toomore Chiang
:Version: 0.1.3 of 2012/03/31
:Version: 0.1.4 of 2012/04/01
:Python Version: Python 2.6-2.7

-----------------------------
Expand Down Expand Up @@ -240,6 +240,12 @@ Quick Start
Change Logs
-----------------------------

0.1.4 2012/04/01
====================================

- 修正:每月首日無資料抓取問題


0.1.3 2012/03/31
====================================

Expand Down
2 changes: 1 addition & 1 deletion grs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# THE SOFTWARE.

__title__ = 'grs'
__version__ = '0.1.3'
__version__ = '0.1.4'
__author__ = 'Toomore Chiang'
__license__ = 'MIT'
__copyright__ = 'Copyright (C) 2012 Toomore Chiang'
Expand Down
11 changes: 7 additions & 4 deletions grs/fetch_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,13 @@ def __to_list(self, csv_file):
except:
pass
tolist.append(i)
self.__info = (tolist[0][0].split(' ')[1],
tolist[0][0].split(' ')[2].decode('big5'))
self.__RawRowsName = tolist[1]
return tolist[2:]
if len(tolist):
self.__info = (tolist[0][0].split(' ')[1],
tolist[0][0].split(' ')[2].decode('big5'))
self.__RawRowsName = tolist[1]
return tolist[2:]
else:
return []

def __serial_fetch(self, no, month):
""" [list] 串接每月資料 舊→新 """
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
'含即時盤、台灣時間轉換、開休市判斷。'

setup(name='grs',
version='0.1.3',
version='0.1.4',
description=description,
long_description=long_description,
author='Toomore Chiang',
Expand Down

0 comments on commit 62235b6

Please sign in to comment.