Fix stock symbol for new stock purchasing; fix document format

Author: sinall

README.rst

@@ -16,10 +16,10 @@ ShiPanE-Python-SDK
 
 - 安装 Python 3.5（建议安装 Anaconda3）
 - cmd 中运行：pip install shipane_sdk
-- cmd 中运行：explorer %UserProfile%\.shipane_sdk
+- cmd 中运行：explorer %UserProfile%\\.shipane_sdk
 - 进入 config 目录；将 scheduler-example.ini 拷贝为 scheduler.ini；并修改内容（建议使用Notepad++）
-- 找到 python 安装目录，例如：C:\Users\[用户名]\Anaconda3
-- cmd 下执行（具体路径自行修改）：python "C:\Users\[用户名]\Anaconda3\Scripts\shipane-scheduler.py"
+- 找到 python 安装目录，例如：C:\\Program Files\\Anaconda3
+- cmd 下执行（具体路径自行修改）：python "C:\\Program Files\\Anaconda3\\Scripts\\shipane-scheduler.py"
 
 二. Mac/Linux
 ~~~~~~~~~~~~~

shipane_sdk/jobs/new_stock_purchase.py

@@ -24,7 +24,7 @@ def __call__(self):
             for index, row in df.iterrows():
                 try:
                     order = {
-                        'symbol': row['code'], 'type': 'LIMIT', 'price': row['price'], 'amountProportion': 'ALL'
+                        'symbol': row['xcode'], 'type': 'LIMIT', 'price': row['price'], 'amountProportion': 'ALL'
                     }
                     self._log.info(u'下单：%s', json.dumps(order))
                     response = self._client.buy(client, **order)

shipane_sdk/stock.py

@@ -15,8 +15,8 @@ def new_stocks():
         table.remove(table.cssselect('thead')[0])
         table_html = lxml.html.etree.tostring(table).decode('utf-8')
         df = pd.read_html(table_html, skiprows=[0, 1])[0]
-        df = df.drop([df.columns[idx] for idx in [1, 12, 13, 14]], axis=1)
-        df.columns = ['code', 'name', 'ipo_date', 'issue_date', 'amount', 'markets', 'price', 'pe', 'limit', 'funds',
-                      'ballot']
-        df['code'] = df['code'].astype(str)
+        df = df.select(lambda x: x in [0, 1, 2, 3, 7], axis=1)
+        df.columns = ['code', 'xcode', 'name', 'ipo_date', 'price']
+        df['code'] = df['code'].map(lambda x: str(x).zfill(6))
+        df['xcode'] = df['xcode'].map(lambda x: str(x).zfill(6))
         return df

tests/shipane_sdk/test_stock.py

@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from shipane_sdk.stock import StockUtils
+
+
+class StockUtilsTest(unittest.TestCase):
+    def test_new_stocks(self):
+        df = StockUtils.new_stocks()
+        self.assertTrue((df.columns == ['code', 'xcode', 'name', 'ipo_date', 'price']).all())