Skip to content

Commit 9c60171

Browse files
author
Roy Williams
committed
Fix tests
1 parent 76c03c5 commit 9c60171

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

swagger_py_codegen/flask.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,21 @@ def _type(parameters):
9696

9797
return url, params
9898

99+
if six.PY3:
100+
def _remove_characters(text, deletechars):
101+
return text.translate({ord(x): None for x in deletechars})
102+
else:
103+
def _remove_characters(text, deletechars):
104+
return text.translate(None, deletechars)
99105

100106
def _path_to_endpoint(swagger_path):
101-
return swagger_path.strip('/').replace('/', '_').replace('-', '_').translate(None, '{}')
107+
return _remove_characters(
108+
swagger_path.strip('/').replace('/', '_').replace('-', '_'),
109+
'{}')
102110

103111

104112
def _path_to_resource_name(swagger_path):
105-
return swagger_path.title().translate(None, '{}/_-')
113+
return _remove_characters(swagger_path.title(), '{}/_-')
106114

107115

108116
def _location(swagger_location):

swagger_py_codegen/parser.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99

1010
def schema_var_name(path):
11-
return ''.join(map(string.capitalize, path))
11+
return ''.join(map(str.capitalize, path))
1212

1313

1414
class RefNode(dict):

tests/test_flask.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from __future__ import absolute_import
2+
23
from swagger_py_codegen.parser import Swagger
34
from swagger_py_codegen.flask import (
45
_swagger_to_flask_url,
@@ -135,6 +136,7 @@ def test_process_data():
135136
swagger = Swagger(data)
136137
generator = FlaskGenerator(swagger)
137138
schemas, routes, view1, view2 = list(generator.generate())[:4]
139+
view1, view2 = sorted([view1, view2], key=lambda x: x.data['name'])
138140
assert ('posts_post_id', 'GET') in schemas.data['validators']
139141
assert schemas.data['validators'][('posts_post_id', 'GET')]['args']['properties']['page']['type'] == 'integer'
140142
assert view1.data['url'] == '/posts/<int:post_id>'

0 commit comments

Comments
 (0)