Merge 6bf0485 into 7b57775

chinapnr · May 15, 2019 · 4755eff · 4755eff
2 parents 7b57775 + 6bf0485
commit 4755eff
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/docs/change_log.rst b/docs/change_log.rst
@@ -1,5 +1,10 @@
 更新记录
 ===========================
+2019.5.14 v1.1.11
+---------------------------
+* `#229 <https://github.com/chinapnr/fishbase/issues/229>`_, random, edit function :meth:`fish_random.gen_random_bank_card` optimize;
+
+
 2019.4.30 v1.1.10
 ---------------------------
 * `#226 <https://github.com/chinapnr/fishbase/issues/226>`_, file, add function :meth:`fish_file.get_file_encoding`, doc and unittest;

diff --git a/docs/conf.py b/docs/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.10'
+version = '1.1.11'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.10'
+release = '1.1.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/fishbase/fish_random.py b/fishbase/fish_random.py
@@ -382,12 +382,13 @@ def gen_random_address(zone):
 
 
 # v1.1.5 edit by Hu Jun #172
-def gen_random_bank_card(bankname, card_type):
+# v1.1.11 edit by Hu Jun #229
+def gen_random_bank_card(bank_name=None, card_type=None):
     """
     通过指定的银行名称，随机生成该银行的卡号
 
     :param:
-        * bankname: (string) 银行名称 eg. 中国银行
+        * bank_name: (string) 银行名称 eg. 中国银行
         * card_type：(string) 卡种类，可选 CC(信用卡)、DC(借记卡)
 
     :returns:
@@ -396,21 +397,29 @@ def gen_random_bank_card(bankname, card_type):
     举例如下::
 
         print('--- gen_random_bank_card demo ---')
+        print(gen_bank_card())
         print(gen_bank_card('中国银行', 'CC'))
         print(gen_bank_card('中国银行', 'DC'))
         print('---')
 
     输出结果::
 
         --- gen_random_bank_card demo ---
+        6282689914390956
         6259073791134721
         6212836989522229131
         ---
 
     """
-    bank_info = CardBin.get_bank_info(bankname)
+    if not bank_name:
+        # 不指定银行名称时，银行名称从 中国工商银行、中国农业银行、中国银行、中国建设银行 中选取
+        bank_name = random.choice(['中国工商银行', '中国农业银行', '中国银行', '中国建设银行'])
+    if not card_type:
+        card_type = random.choice(['DC', 'CC'])
+
+    bank_info = CardBin.get_bank_info(bank_name)
     if not bank_info:
-        raise ValueError('bankname {} error, check and try again'.format(bankname))
+        raise ValueError('bankname {} error, check and try again'.format(bank_name))
 
     # 获取银行代码
     bank = bank_info[0][0]

diff --git a/test/test_random.py b/test/test_random.py
@@ -99,6 +99,11 @@ def test_gen_random_bank_card_02(self):
         with pytest.raises(ValueError):
             gen_random_bank_card('中国银行', 'AA')
 
+    # test gen_random_bank_card() tc
+    def test_gen_random_bank_card_03(self):
+        random_bank_card = gen_random_bank_card()
+        assert CardBin.check_bankcard(random_bank_card)
+
     # test gen_random_id_card() tc
     def test_gen_random_id_card_01(self):
         random_id_list = gen_random_id_card()