Skip to content

Commit c37268b

Browse files
fix: Modify the parameter name encoding to file_encoding,
1 parent e1dbdc5 commit c37268b

File tree

1 file changed

+15
-16
lines changed

1 file changed

+15
-16
lines changed

openapi_python_client/__init__.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ class Project:
4444
project_name_override: Optional[str] = None
4545
package_name_override: Optional[str] = None
4646
package_version_override: Optional[str] = None
47-
file_encoding: str
4847

4948
def __init__(
5049
self,
@@ -56,7 +55,7 @@ def __init__(
5655
) -> None:
5756
self.openapi: GeneratorData = openapi
5857
self.meta: MetaType = meta
59-
self.encoding = file_encoding
58+
self.file_encoding = file_encoding
6059

6160
package_loader = PackageLoader(__package__)
6261
loader: BaseLoader
@@ -147,16 +146,16 @@ def _create_package(self) -> None:
147146

148147
package_init_template = self.env.get_template("package_init.py.jinja")
149148
package_init.write_text(
150-
package_init_template.render(description=self.package_description), encoding=self.encoding
149+
package_init_template.render(description=self.package_description), encoding=self.file_encoding
151150
)
152151

153152
if self.meta != MetaType.NONE:
154153
pytyped = self.package_dir / "py.typed"
155-
pytyped.write_text("# Marker file for PEP 561", encoding=self.encoding)
154+
pytyped.write_text("# Marker file for PEP 561", encoding=self.file_encoding)
156155

157156
types_template = self.env.get_template("types.py.jinja")
158157
types_path = self.package_dir / "types.py"
159-
types_path.write_text(types_template.render(), encoding=self.encoding)
158+
types_path.write_text(types_template.render(), encoding=self.file_encoding)
160159

161160
def _build_metadata(self) -> None:
162161
if self.meta == MetaType.NONE:
@@ -173,13 +172,13 @@ def _build_metadata(self) -> None:
173172
readme_template.render(
174173
project_name=self.project_name, description=self.package_description, package_name=self.package_name
175174
),
176-
encoding=self.encoding,
175+
encoding=self.file_encoding,
177176
)
178177

179178
# .gitignore
180179
git_ignore_path = self.project_dir / ".gitignore"
181180
git_ignore_template = self.env.get_template(".gitignore.jinja")
182-
git_ignore_path.write_text(git_ignore_template.render(), encoding=self.encoding)
181+
git_ignore_path.write_text(git_ignore_template.render(), encoding=self.file_encoding)
183182

184183
def _build_pyproject_toml(self, *, use_poetry: bool) -> None:
185184
template = "pyproject.toml.jinja" if use_poetry else "pyproject_no_poetry.toml.jinja"
@@ -192,7 +191,7 @@ def _build_pyproject_toml(self, *, use_poetry: bool) -> None:
192191
version=self.version,
193192
description=self.package_description,
194193
),
195-
encoding=self.encoding,
194+
encoding=self.file_encoding,
196195
)
197196

198197
def _build_setup_py(self) -> None:
@@ -205,7 +204,7 @@ def _build_setup_py(self) -> None:
205204
version=self.version,
206205
description=self.package_description,
207206
),
208-
encoding=self.encoding,
207+
encoding=self.file_encoding,
209208
)
210209

211210
def _build_models(self) -> None:
@@ -218,7 +217,7 @@ def _build_models(self) -> None:
218217
model_template = self.env.get_template("model.py.jinja")
219218
for model in self.openapi.models.values():
220219
module_path = models_dir / f"{model.reference.module_name}.py"
221-
module_path.write_text(model_template.render(model=model), encoding=self.encoding)
220+
module_path.write_text(model_template.render(model=model), encoding=self.file_encoding)
222221
imports.append(import_string_from_reference(model.reference))
223222

224223
# Generate enums
@@ -227,25 +226,25 @@ def _build_models(self) -> None:
227226
for enum in self.openapi.enums.values():
228227
module_path = models_dir / f"{enum.reference.module_name}.py"
229228
if enum.value_type is int:
230-
module_path.write_text(int_enum_template.render(enum=enum), encoding=self.encoding)
229+
module_path.write_text(int_enum_template.render(enum=enum), encoding=self.file_encoding)
231230
else:
232-
module_path.write_text(str_enum_template.render(enum=enum), encoding=self.encoding)
231+
module_path.write_text(str_enum_template.render(enum=enum), encoding=self.file_encoding)
233232
imports.append(import_string_from_reference(enum.reference))
234233

235234
models_init_template = self.env.get_template("models_init.py.jinja")
236-
models_init.write_text(models_init_template.render(imports=imports), encoding=self.encoding)
235+
models_init.write_text(models_init_template.render(imports=imports), encoding=self.file_encoding)
237236

238237
def _build_api(self) -> None:
239238
# Generate Client
240239
client_path = self.package_dir / "client.py"
241240
client_template = self.env.get_template("client.py.jinja")
242-
client_path.write_text(client_template.render(), encoding=self.encoding)
241+
client_path.write_text(client_template.render(), encoding=self.file_encoding)
243242

244243
# Generate endpoints
245244
api_dir = self.package_dir / "api"
246245
api_dir.mkdir()
247246
api_init = api_dir / "__init__.py"
248-
api_init.write_text('""" Contains methods for accessing the API """', encoding=self.encoding)
247+
api_init.write_text('""" Contains methods for accessing the API """', encoding=self.file_encoding)
249248

250249
endpoint_template = self.env.get_template("endpoint_module.py.jinja")
251250
for tag, collection in self.openapi.endpoint_collections_by_tag.items():
@@ -255,7 +254,7 @@ def _build_api(self) -> None:
255254

256255
for endpoint in collection.endpoints:
257256
module_path = tag_dir / f"{snake_case(endpoint.name)}.py"
258-
module_path.write_text(endpoint_template.render(endpoint=endpoint), encoding=self.encoding)
257+
module_path.write_text(endpoint_template.render(endpoint=endpoint), encoding=self.file_encoding)
259258

260259

261260
def _get_project_for_url_or_path(

0 commit comments

Comments
 (0)