Merge branch 'master' of github.com:wordnik/swagger-codegen

Author: casualjim

samples/client/petstore/php/Swagger.php

@@ -11,7 +11,7 @@
  * @param string $className the class to attempt to load
  */
 function swagger_autoloader($className) {
-	$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/'));
+	$currentDir = dirname(__FILE__);
 	if (file_exists($currentDir . '/' . $className . '.php')) {
 		include $currentDir . '/' . $className . '.php';
 	} elseif (file_exists($currentDir . '/models/' . $className . '.php')) {

samples/client/wordnik-api/php/wordnik/Swagger.php

@@ -11,7 +11,7 @@
  * @param string $className the class to attempt to load
  */
 function swagger_autoloader($className) {
-	$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/'));
+	$currentDir = dirname(__FILE__);
 	if (file_exists($currentDir . '/' . $className . '.php')) {
 		include $currentDir . '/' . $className . '.php';
 	} elseif (file_exists($currentDir . '/models/' . $className . '.php')) {

src/main/resources/php/Swagger.mustache

@@ -11,7 +11,7 @@
  * @param string $className the class to attempt to load
  */
 function swagger_autoloader($className) {
-	$currentDir = substr(__FILE__, 0, strrpos(__FILE__, '/'));
+	$currentDir = dirname(__FILE__);
 	if (file_exists($currentDir . '/' . $className . '.php')) {
 		include $currentDir . '/' . $className . '.php';
 	} elseif (file_exists($currentDir . '/models/' . $className . '.php')) {

src/main/resources/python/swagger.mustache

@@ -44,15 +44,18 @@ class ApiClient:
 
         data = None
 
-        if method == 'GET':
+        if queryParams:
+            # Need to remove None values, these should not be sent
+            sentQueryParams = {}
+            for param, value in queryParams.items():
+                if value != None:
+                    sentQueryParams[param] = value
+            url = url + '?' + urllib.urlencode(sentQueryParams)
 
-            if queryParams:
-                # Need to remove None values, these should not be sent
-                sentQueryParams = {}
-                for param, value in queryParams.items():
-                    if value != None:
-                        sentQueryParams[param] = value
-                url = url + '?' + urllib.urlencode(sentQueryParams)
+        if method in ['GET']:
+
+            #Options to add statements later on and for compatibility
+            pass
 
         elif method in ['POST', 'PUT', 'DELETE']:
 
@@ -95,7 +98,7 @@ class ApiClient:
     def sanitizeForSerialization(self, obj):
         """Dump an object into JSON for POSTing."""
 
-        if not obj:
+        if type(obj) == type(None):
             return None
         elif type(obj) in [str, int, long, float, bool]:
             return obj
@@ -164,6 +167,8 @@ class ApiClient:
                         value = attrType(value)
                     except UnicodeEncodeError:
                         value = unicode(value)
+                    except TypeError:
+                        value = value
                     setattr(instance, attr, value)
                 elif (attrType == 'datetime'):
                     setattr(instance, attr, datetime.datetime.strptime(value[:-5],

src/main/resources/python3/swagger.mustache

@@ -43,15 +43,19 @@ class ApiClient:
 
         data = None
 
-        if method == 'GET':
+        
+        if queryParams:
+            # Need to remove None values, these should not be sent
+            sentQueryParams = {}
+            for param, value in queryParams.items():
+                if value != None:
+                    sentQueryParams[param] = value
+            url = url + '?' + urllib.parse.urlencode(sentQueryParams)
 
-            if queryParams:
-                # Need to remove None values, these should not be sent
-                sentQueryParams = {}
-                for param, value in queryParams.items():
-                    if value != None:
-                        sentQueryParams[param] = value
-                url = url + '?' + urllib.parse.urlencode(sentQueryParams)
+        if method in ['GET']:
+
+            #Options to add statements later on and for compatibility
+            pass
 
         elif method in ['POST', 'PUT', 'DELETE']:
 
@@ -98,7 +102,7 @@ class ApiClient:
     def sanitizeForSerialization(self, obj):
         """Dump an object into JSON for POSTing."""
 
-        if not obj:
+        if type(obj) == type(None):
             return None
         elif type(obj) in [str, int, float, bool]:
             return obj
@@ -159,6 +163,8 @@ class ApiClient:
                         value = attrType(value)
                     except UnicodeEncodeError:
                         value = unicode(value)
+                    except TypeError:
+                        value = value
                     setattr(instance, attr, value)
                 elif (attrType == 'datetime'):
                     setattr(instance, attr, datetime.datetime.strptime(value[:-5],