From 792726ddc52bedec35532d652cda5651b5ac15d9 Mon Sep 17 00:00:00 2001 From: wing328 Date: Tue, 3 Nov 2015 10:29:28 +0800 Subject: [PATCH] update sample, better handle of $ in naming --- .../languages/PythonClientCodegen.java | 6 ++++++ samples/client/petstore/python/.coverage | Bin 3918 -> 6348 bytes .../petstore/python/dev-requirements.txt.log | 7 +++++++ .../python/swagger_client/configuration.py | 4 ++++ 4 files changed, 17 insertions(+) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java index ad8fbc683fc..2722a93b3c9 100755 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PythonClientCodegen.java @@ -173,6 +173,9 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig // sanitize name name = sanitizeName(name); + // remove dollar sign + name = name.replaceAll("$", ""); + // if it's all uppper case, convert to lower case if (name.matches("^[A-Z_]*$")) { name = name.toLowerCase(); @@ -203,6 +206,9 @@ public class PythonClientCodegen extends DefaultCodegen implements CodegenConfig public String toModelName(String name) { name = sanitizeName(name); + // remove dollar sign + name = name.replaceAll("$", ""); + // model name cannot use reserved keyword, e.g. return if (reservedWords.contains(name)) { throw new RuntimeException(name + " (reserved word) cannot be used as a model name"); diff --git a/samples/client/petstore/python/.coverage b/samples/client/petstore/python/.coverage index d58a8fe9c63feb32f3168f71e645ace0827bed20..03f8b2a2d03d1fee6eba2071dc2d2b0306bd6877 100644 GIT binary patch literal 6348 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 literal 3918 zcmd6qd32QJ8O8fNvI+=7WC@7SDuf`JASj@M3lNs;6^)LFGQ^mC8OA1=d@~bbz?7Y$ zfD4L%vWiNjEp4r>TU%?fh+VW=v6d=YZPnIl7cK6!&--Qu(^EXB|I9i4FFDCM-}}7x z-rs%RMcNWdQM7YavbHv;$|O^vM!Q!f=LM}D*GiK)JM{lbq%#aI#N}e25Th)r&!pz2nFbkKIn^nC`5k@#2^gDNf?SE6k`NRaSBFZG)~277>hG8 z0h2KW(=Z(~Z~-nvIik1>mt!_6P>Cy1hk7)i5%X|0u0abHVi6W&36^3RmSY9Jij`P} z)mVe;aRb)kX54~x*oe*8ify<9cj7MGjh(m$yYVf28{ffqaUZ^i@8f@oNbR<(5cUOFLEbLN*UO3J!xgUvb193@6*wmSCh^?r4n1S(s`UdXZh_ z99)5F)F6(zc9jiCA%porv?jlYO{S`Ylsj(MSlI1I$1TQif8nc8cx0o$o(hv9NoQ zOOrQwAqJQRgR=H^DwLSPCwWUxHA6c)UuMb2JEu5vD8duq1&e}=SBs5jhrc0~I z_wd*}y2-}Kg2PSIBNiT;lgCBY1=dY85GVN9ehDXe1n&!_M!JdIylIG@8S7RcA}Cf>3@zK0L+AwI&#_{5_51)&Jl2ehNGQ!b{* z2)m2jEqe-k`PBAy!DXSazi^CjtZ$0oG6?moGhFooGLs| zNa6Xy8Nv&M7Yn1pON29pmkMVIFB4uaoGpwA=LoBW)xtnnBdilP3Y&yi3+D?L2(J;g z2p0+$2^R~O2$u?%30DYL3U3hJC|oPNMYvA5Ubs=XO}JgSLwJ|)ZsFI2yM*@&?-SlH zd_ef1@FC&D!ac$lg|7);7yd=~w(yYf6XCyvp9(uGdn$V=3zP$uLzG3zVaj6VaOKI$ z5z2@L(RiLBR+X%;NyHmdm6=4c-g&ZTEbR4}CtZm+FFGd<$+FJXNQrszRKtZUkaNwG zWkx*bNmnA}mbjUgxmiASbF4_Jjeeo!YYDE!bygJXv-Pmu3StL#2GK;Grpv;+sxlMA zlc{DmUqLK9E;rx*A;CTJY~{!SuXil$^ZCFl&K6IpA+y15J~K@M*W^xuD^O)J z1RfD}|AoCKYxib@L@N+ngWqOA*zAGeI=r>Pcj4<<`nv{y;Bb5Y$eQ3YRP43Ze!+U- zCF|`!`riJN2gTd?tM&Igc-N583Jed6qlE3-z@oG8XpfApzT6K}V~B95aG0=II9ymN z94Q(f!Jx1_ z$A#;JtA%SkAdC(-dq8aPbl4=^BHWt8#2ua#cjjQRGslZZg^vk;DtuhHPxyrJN#Rq% zr-jc5pB3&GJ|}!$ctH4q=g2|fOTw3hzZbrm!^#_;EN=<_Cj5u+9pSsee|pfoCwyP{ zf$&4&N5YRicZ@ZClzo+j%Kpj$%E8JnDo<3Nq#T-KkO9c(Q{n)`k;+q)qm^TnW0m8S zaiDVHl(C|4?1DOW4kC~s1(RjyO6S8h;lRNkh%UAalQS-C~IRk=;M zJ&(}zA#JqhL@uR$V`0A|r?k{kwb#{Nh0t_2QOfLKd0tkH9}abev9SM=0.3.0 (from tox->-r dev-requirements.txt (line 2)) Using cached pluggy-0.3.0-py2.py3-none-any.whl Installing collected packages: nose, virtualenv, py, pluggy, tox, coverage, randomize Successfully installed coverage-3.7.1 nose-1.3.7 pluggy-0.3.0 py-1.4.30 randomize-0.13 tox-2.1.1 virtualenv-13.1.2 +Requirement already satisfied (use --upgrade to upgrade): nose in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 1)) +Requirement already satisfied (use --upgrade to upgrade): tox in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): coverage in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 3)) +Requirement already satisfied (use --upgrade to upgrade): randomize in ./.venv/lib/python2.7/site-packages (from -r dev-requirements.txt (line 4)) +Requirement already satisfied (use --upgrade to upgrade): virtualenv>=1.11.2 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): py>=1.4.17 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) +Requirement already satisfied (use --upgrade to upgrade): pluggy<0.4.0,>=0.3.0 in ./.venv/lib/python2.7/site-packages (from tox->-r dev-requirements.txt (line 2)) diff --git a/samples/client/petstore/python/swagger_client/configuration.py b/samples/client/petstore/python/swagger_client/configuration.py index 122a347b3ab..ecbecf7e9f9 100644 --- a/samples/client/petstore/python/swagger_client/configuration.py +++ b/samples/client/petstore/python/swagger_client/configuration.py @@ -72,6 +72,10 @@ class Configuration(object): # Password for HTTP basic authentication self.password = "" + # access token for OAuth + self.access_token = "" + + # Logging Settings self.logger = {} self.logger["package_logger"] = logging.getLogger("swagger_client")