Skip to content

Commit fcc4c2c

Browse files
committed
fixed python namespace package folders
1 parent e89c34f commit fcc4c2c

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,16 +204,18 @@ public void processOpts() {
204204

205205
this.setCaseType();
206206

207+
final String packageFolder = packageName.replace('.', File.separatorChar);
208+
207209
supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
208210

209211
supportingFiles.add(new SupportingFile("tox.mustache", "", "tox.ini"));
210212
supportingFiles.add(new SupportingFile("test-requirements.mustache", "", "test-requirements.txt"));
211213
supportingFiles.add(new SupportingFile("requirements.mustache", "", "requirements.txt"));
212214

213-
supportingFiles.add(new SupportingFile("configuration.mustache", packageName, "configuration.py"));
214-
supportingFiles.add(new SupportingFile("__init__package.mustache", packageName, "__init__.py"));
215-
supportingFiles.add(new SupportingFile("__init__model.mustache", packageName + File.separatorChar + modelPackage, "__init__.py"));
216-
supportingFiles.add(new SupportingFile("__init__api.mustache", packageName + File.separatorChar + apiPackage, "__init__.py"));
215+
supportingFiles.add(new SupportingFile("configuration.mustache", packageFolder, "configuration.py"));
216+
supportingFiles.add(new SupportingFile("__init__package.mustache", packageFolder, "__init__.py"));
217+
supportingFiles.add(new SupportingFile("__init__model.mustache", packageFolder + File.separatorChar + modelPackage, "__init__.py"));
218+
supportingFiles.add(new SupportingFile("__init__api.mustache", packageFolder + File.separatorChar + apiPackage, "__init__.py"));
217219

218220
if(Boolean.FALSE.equals(excludeTests)) {
219221
supportingFiles.add(new SupportingFile("__init__test.mustache", testFolder, "__init__.py"));
@@ -222,16 +224,16 @@ public void processOpts() {
222224
supportingFiles.add(new SupportingFile("gitignore.mustache", "", ".gitignore"));
223225
supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml"));
224226
supportingFiles.add(new SupportingFile("setup.mustache", "", "setup.py"));
225-
supportingFiles.add(new SupportingFile("api_client.mustache", packageName, "api_client.py"));
227+
supportingFiles.add(new SupportingFile("api_client.mustache", packageFolder, "api_client.py"));
226228

227229
if ("asyncio".equals(getLibrary())) {
228-
supportingFiles.add(new SupportingFile("asyncio/rest.mustache", packageName, "rest.py"));
230+
supportingFiles.add(new SupportingFile("asyncio/rest.mustache", packageFolder, "rest.py"));
229231
additionalProperties.put("asyncio", "true");
230232
} else if ("tornado".equals(getLibrary())) {
231-
supportingFiles.add(new SupportingFile("tornado/rest.mustache", packageName, "rest.py"));
233+
supportingFiles.add(new SupportingFile("tornado/rest.mustache", packageFolder, "rest.py"));
232234
additionalProperties.put("tornado", "true");
233235
} else {
234-
supportingFiles.add(new SupportingFile("rest.mustache", packageName, "rest.py"));
236+
supportingFiles.add(new SupportingFile("rest.mustache", packageFolder, "rest.py"));
235237
}
236238

237239
modelPackage = packageName + "." + modelPackage;

0 commit comments

Comments
 (0)