Merge branch 'develop_2.0' of github.com:swagger-api/swagger-codegen into develop_2.0

Author: fehguy

modules/swagger-codegen/src/main/resources/python/api.mustache

@@ -63,8 +63,8 @@ class {{classname}}(object):
         files = {}
         bodyParam = None
 
-        headerParams['Accept'] = '{{#produces}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/produces}}';
-        headerParams['Content-Type'] = '{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}';
+        headerParams['Accept'] = '{{#produces}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/produces}}'
+        headerParams['Content-Type'] = '{{#consumes}}{{mediaType}}{{#hasMore}},{{/hasMore}}{{/consumes}}'
 
         {{#queryParams}}
         if ('{{paramName}}' in params):

modules/swagger-codegen/src/main/resources/python/swagger.mustache

@@ -28,24 +28,28 @@ class ApiClient(object):
     headerValue: a header value to pass when making calls to the API
   """
   def __init__(self, host=None, headerName=None, headerValue=None):
-    self.headerName = headerName
-    self.headerValue = headerValue
+    self.defaultHeaders = {}
+    if (headerName is not None):
+      self.defaultHeaders[headerName] = headerValue
     self.host = host
     self.cookie = None
     self.boundary = ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(30))
 
+  def setDefaultHeader(self, headerName, headerValue):
+    self.defaultHeaders[headerName] = headerValue
+
   def callAPI(self, resourcePath, method, queryParams, postData,
               headerParams=None, files=None):
 
     url = self.host + resourcePath
+
+    mergedHeaderParams = self.defaultHeaders.copy()
+    mergedHeaderParams.update(headerParams)
     headers = {}
-    if headerParams:
-      for param, value in headerParams.iteritems():
+    if mergedHeaderParams:
+      for param, value in mergedHeaderParams.iteritems():
         headers[param] = ApiClient.sanitizeForSerialization(value)
 
-    if self.headerName:
-      headers[self.headerName] = ApiClient.sanitizeForSerialization(self.headerValue)
-
     if self.cookie:
       headers['Cookie'] = ApiClient.sanitizeForSerialization(self.cookie)