Merge branch 'python-style-tweaks'

Author: pimterry

src/targets/python/helpers.js

@@ -25,6 +25,8 @@ function concatValues (concatType, values, pretty, indentation, indentLevel) {
 
   if (pretty) {
     return openingBrace + '\n' + currentIndent + values.join(join) + '\n' + closingBraceIndent + closingBrace
+  } else if (concatType === 'object' && values.length > 0) {
+    return openingBrace + ' ' + values.join(join) + ' ' + closingBrace
   } else {
     return openingBrace + values.join(join) + closingBrace
   }

src/targets/python/python3.js

@@ -52,7 +52,7 @@ module.exports = function (source, options) {
   const headerCount = Object.keys(headers).length
   if (headerCount === 1) {
     for (const header in headers) {
-      code.push('headers = { \'%s\': "%s" }', header, headers[header])
+      code.push('headers = { "%s": "%s" }', header, headers[header])
         .blank()
     }
   } else if (headerCount > 1) {
@@ -62,9 +62,9 @@ module.exports = function (source, options) {
 
     for (const header in headers) {
       if (count++ !== headerCount) {
-        code.push('    \'%s\': "%s",', header, headers[header])
+        code.push('    "%s": "%s",', header, headers[header])
       } else {
-        code.push('    \'%s\': "%s"', header, headers[header])
+        code.push('    "%s": "%s"', header, headers[header])
       }
     }
 

src/targets/python/requests.js

@@ -14,6 +14,16 @@ const util = require('util')
 const CodeBuilder = require('../../helpers/code-builder')
 const helpers = require('./helpers')
 
+const builtInMethods = [
+  'HEAD',
+  'GET',
+  'POST',
+  'PUT',
+  'PATCH',
+  'DELETE',
+  'OPTIONS'
+]
+
 module.exports = function (source, options) {
   const opts = Object.assign({
     indent: '    ',
@@ -34,7 +44,7 @@ module.exports = function (source, options) {
   // Construct query string
   let qs
   if (Object.keys(source.queryObj).length) {
-    qs = 'querystring = ' + JSON.stringify(source.queryObj)
+    qs = 'querystring = ' + helpers.literalRepresentation(source.queryObj, opts)
 
     code.push(qs)
       .blank()
@@ -52,6 +62,14 @@ module.exports = function (source, options) {
       }
       break
 
+    case 'application/x-www-form-urlencoded':
+      if (source.postData.paramsObj) {
+        code.push('payload = %s', helpers.literalRepresentation(source.postData.paramsObj, opts))
+        hasPayload = true
+        break
+      }
+      // Otherwise, fall through to treat as plain text:
+
     default: {
       const payload = JSON.stringify(source.postData.text)
       if (payload) {
@@ -67,7 +85,7 @@ module.exports = function (source, options) {
 
   if (headerCount === 1) {
     for (const header in headers) {
-      code.push('headers = {"%s": "%s"}', header, headers[header])
+      code.push('headers = { "%s": "%s" }', header, headers[header])
         .blank()
     }
   } else if (headerCount > 1) {
@@ -89,7 +107,10 @@ module.exports = function (source, options) {
 
   // Construct request
   const method = source.method
-  let request = util.format('response = requests.request("%s", url', method)
+
+  let request = builtInMethods.includes(method)
+    ? util.format('response = requests.%s(url', method.toLowerCase())
+    : util.format('response = requests.request("%s", url', method)
 
   if (hasPayload) {
     if (jsonPayload) {

test/fixtures/output/python/python3/application-form-encoded.py

@@ -4,7 +4,7 @@
 
 payload = "foo=bar&hello=world"
 
-headers = { 'content-type': "application/x-www-form-urlencoded" }
+headers = { "content-type": "application/x-www-form-urlencoded" }
 
 conn.request("POST", "/har", payload, headers)
 

test/fixtures/output/python/python3/application-json.py

@@ -4,7 +4,7 @@
 
 payload = "{\"number\":1,\"string\":\"f\\\"oo\",\"arr\":[1,2,3],\"nested\":{\"a\":\"b\"},\"arr_mix\":[1,\"a\",{\"arr_mix_nested\":{}}],\"boolean\":false}"
 
-headers = { 'content-type': "application/json" }
+headers = { "content-type": "application/json" }
 
 conn.request("POST", "/har", payload, headers)
 

test/fixtures/output/python/python3/cookies.py

@@ -2,7 +2,7 @@
 
 conn = http.client.HTTPConnection("mockbin.com")
 
-headers = { 'cookie': "foo=bar; bar=baz" }
+headers = { "cookie": "foo=bar; bar=baz" }
 
 conn.request("POST", "/har", headers=headers)
 

test/fixtures/output/python/python3/full.py

@@ -5,9 +5,9 @@
 payload = "foo=bar"
 
 headers = {
-    'cookie': "foo=bar; bar=baz",
-    'accept': "application/json",
-    'content-type': "application/x-www-form-urlencoded"
+    "cookie": "foo=bar; bar=baz",
+    "accept": "application/json",
+    "content-type": "application/x-www-form-urlencoded"
     }
 
 conn.request("POST", "/har?foo=bar&foo=baz&baz=abc&key=value", payload, headers)

test/fixtures/output/python/python3/headers.py

@@ -3,8 +3,8 @@
 conn = http.client.HTTPConnection("mockbin.com")
 
 headers = {
-    'accept': "application/json",
-    'x-foo': "Bar"
+    "accept": "application/json",
+    "x-foo": "Bar"
     }
 
 conn.request("GET", "/har", headers=headers)

test/fixtures/output/python/python3/jsonObj-multiline.py

@@ -4,7 +4,7 @@
 
 payload = "{\n  \"foo\": \"bar\"\n}"
 
-headers = { 'content-type': "application/json" }
+headers = { "content-type": "application/json" }
 
 conn.request("POST", "/har", payload, headers)
 

test/fixtures/output/python/python3/jsonObj-null-value.py

@@ -4,7 +4,7 @@
 
 payload = "{\"foo\":null}"
 
-headers = { 'content-type': "application/json" }
+headers = { "content-type": "application/json" }
 
 conn.request("POST", "/har", payload, headers)