Merge b3845a3 into a59ca51

docs/conf.py

@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.1'
+version = '1.1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.1'
+release = '1.1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -218,6 +218,12 @@
 
 # Latex figure (float) alignment
 #'figure_align': 'htbp',
+'preamble': '''
+\\hypersetup{unicode=true}
+\\usepackage{CJKutf8}
+\\AtBeginDocument{\\begin{CJK}{UTF8}{gbsn}}
+\\AtEndDocument{\\end{CJK}}
+'''
 }
 
 # Grouping the document tree into LaTeX files. List of tuples

docs/fish_project.rst

@@ -1,5 +1,5 @@
 ``fish_project`` project 函数包
-===========================
+===============================
 
 .. automodule:: fish_project
    :members:

fishbase/__init__.py

@@ -24,5 +24,5 @@
 from .fish_system import *
 from .fish_project import *
 
-__version__ = '1.1.1'  # type: str
+__version__ = '1.1.2'  # type: str
 

fishbase/fish_common.py

@@ -1081,7 +1081,7 @@ def find_duplicated_between_dicts(dict1, dict2):
         print('--- find_duplicated_between_dicts demo---')
         dict1 = {'x':1, 'y':2, 'z':3}
         dict2 = {'w':10, 'x':1, 'y':2}
-        res = find_common_between_dicts(dict1, dict2)
+        res = find_duplicated_between_dicts(dict1, dict2)
         print(res.item)
         print(res.key)
         print(res.value)
@@ -1095,7 +1095,7 @@ def find_duplicated_between_dicts(dict1, dict2):
         {1}
         ---
     """
-    Duplicated_info = namedtuple('duplicated_info', ['item', 'key', 'value'])
+    Duplicated_info = namedtuple('Duplicated_info', ['item', 'key', 'value'])
     duplicated_info = Duplicated_info(set(dict1.items()) & set(dict2.items()),
                                       set(dict1.keys()) & set(dict2.keys()),
                                       set(dict1.values()) & set(dict2.values()))