fix: fix bug from python 2.7

kwkwc · Oct 29, 2020 · d3c0d0d · d3c0d0d
1 parent cb73de5
commit d3c0d0d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,3 +102,6 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+
+# python2.7 venv
+venv2.7/
diff --git a/examples/sample/sample_app.py b/examples/sample/sample_app.py
@@ -15,7 +15,7 @@
 # Api Document needs to be displayed
 app.config['API_DOC_MEMBER'] = ['api', 'platform']
 
-ApiDoc(app, title='Sample App', version='0.1.9')
+ApiDoc(app, title='Sample App', version='0.2.0')
 
 api = Blueprint('api', __name__)
 platform = Blueprint('platform', __name__)

diff --git a/examples/sample/sample_app_restful.py b/examples/sample/sample_app_restful.py
@@ -17,7 +17,7 @@
 app.config['RESTFUL_API_DOC_EXCLUDE'] = []
 
 restful_api = Api(app)
-ApiDoc(app, title='Sample App Restful', version='0.1.9')
+ApiDoc(app, title='Sample App Restful', version='0.2.0')
 
 
 class TodoList(Resource):

diff --git a/examples/sample/sample_app_restful_methodview .py b/examples/sample/sample_app_restful_methodview .py
@@ -16,7 +16,7 @@
 # RESTful Api documents to be excluded
 app.config['RESTFUL_API_DOC_EXCLUDE'] = []
 
-ApiDoc(app, title='Sample App Restful Methodview', version='0.1.9')
+ApiDoc(app, title='Sample App Restful Methodview', version='0.2.0')
 
 
 class TodoList(MethodView):

diff --git a/flask_docs/__init__.py b/flask_docs/__init__.py
@@ -5,10 +5,10 @@
 Program:
     Flask-Docs
 Version:
-    0.1.9
+    0.2.0
 History:
     Created on 2018/05/20
-    Last modified on 2020/10/29
+    Last modified on 2020/10/30
 Author:
     kwkw
 '''
@@ -136,12 +136,12 @@ def data():
 
                 # Api
                 for rule in app.url_map.iter_rules():
-                    r = str(rule).split('/')[1]
-                    if r not in current_app.config['API_DOC_MEMBER']:
+                    f = str(rule).split('/')[1]
+                    if f not in current_app.config['API_DOC_MEMBER']:
                         continue
 
-                    if r.capitalize() not in dataDict:
-                        dataDict[r.capitalize()] = {'children': []}
+                    if f.capitalize() not in dataDict:
+                        dataDict[f.capitalize()] = {'children': []}
 
                     api = {
                         'name': '',
@@ -150,7 +150,7 @@ def data():
                         'method': '',
                         'doc': '',
                         'doc_md': '',
-                        'router': r.capitalize(),
+                        'router': f.capitalize(),
                         'api_type': 'api'
                     }
 
@@ -163,7 +163,7 @@ def data():
                             [r for r in rule.methods if r in ApiDoc.METHODS_LIST])
 
                         result = filter(
-                            lambda x: x['name'] == name, dataDict[r.capitalize()]['children'])
+                            lambda x: x['name'] == name, dataDict[f.capitalize()]['children'])
                         result_list = list(result)
                         if len(result_list) > 0:
                             result_list[0]['url'] = result_list[0]['url'] + ' ' + url
@@ -187,12 +187,12 @@ def data():
                     except Exception as e:
                         pass
                     else:
-                        dataDict[r.capitalize()]['children'].append(api)
+                        dataDict[f.capitalize()]['children'].append(api)
 
-                    if dataDict[r.capitalize()]['children'] == []:
-                        dataDict.pop(r.capitalize())
+                    if dataDict[f.capitalize()]['children'] == []:
+                        dataDict.pop(f.capitalize())
                     else:
-                        dataDict[r.capitalize()]['children'].sort(
+                        dataDict[f.capitalize()]['children'].sort(
                             key=lambda x: x['name'])
 
                 return jsonify({'data': dataDict, 'title': title, 'version': version, 'noDocText': ApiDoc.NO_DOC})

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@ def read(fname):
 
 setup(
     name='Flask-Docs',
-    version='0.1.9',
+    version='0.2.0',
     url='https://github.com/kwkwc/flask-docs',
     license='MIT',
     author='kwkw',