Make python header spacing & quote usage consistent

pimterry · pimterry · commit 28260f942b06 · 2021-07-09T12:48:33.000+02:00
diff --git a/src/targets/python/helpers.js b/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
   }
diff --git a/src/targets/python/python3.js b/src/targets/python/python3.js
@@ -40,7 +40,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) {
@@ -50,9 +50,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])
       }
     }
 
diff --git a/src/targets/python/requests.js b/src/targets/python/requests.js
@@ -34,7 +34,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()
@@ -67,7 +67,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) {
diff --git a/test/fixtures/output/python/python3/application-form-encoded.py b/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)
 
diff --git a/test/fixtures/output/python/python3/application-json.py b/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)
 
diff --git a/test/fixtures/output/python/python3/cookies.py b/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)
 
diff --git a/test/fixtures/output/python/python3/full.py b/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)
diff --git a/test/fixtures/output/python/python3/headers.py b/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)
diff --git a/test/fixtures/output/python/python3/jsonObj-multiline.py b/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)
 
diff --git a/test/fixtures/output/python/python3/jsonObj-null-value.py b/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)
 
diff --git a/test/fixtures/output/python/python3/multipart-data.py b/test/fixtures/output/python/python3/multipart-data.py
@@ -4,7 +4,7 @@
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"
 
-headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" }
+headers = { "content-type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 conn.request("POST", "/har", payload, headers)
 
diff --git a/test/fixtures/output/python/python3/multipart-file.py b/test/fixtures/output/python/python3/multipart-file.py
@@ -4,7 +4,7 @@
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"
 
-headers = { 'content-type': "multipart/form-data; boundary=---011000010111000001101001" }
+headers = { "content-type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 conn.request("POST", "/har", payload, headers)
 
diff --git a/test/fixtures/output/python/python3/multipart-form-data.py b/test/fixtures/output/python/python3/multipart-form-data.py
@@ -4,7 +4,7 @@
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"
 
-headers = { 'Content-Type': "multipart/form-data; boundary=---011000010111000001101001" }
+headers = { "Content-Type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 conn.request("POST", "/har", payload, headers)
 
diff --git a/test/fixtures/output/python/python3/text-plain.py b/test/fixtures/output/python/python3/text-plain.py
@@ -4,7 +4,7 @@
 
 payload = "Hello World"
 
-headers = { 'content-type': "text/plain" }
+headers = { "content-type": "text/plain" }
 
 conn.request("POST", "/har", payload, headers)
 
diff --git a/test/fixtures/output/python/requests/application-form-encoded.py b/test/fixtures/output/python/requests/application-form-encoded.py
@@ -3,7 +3,7 @@
 url = "http://mockbin.com/har"
 
 payload = "foo=bar&hello=world"
-headers = {"content-type": "application/x-www-form-urlencoded"}
+headers = { "content-type": "application/x-www-form-urlencoded" }
 
 response = requests.request("POST", url, data=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/application-json.py b/test/fixtures/output/python/requests/application-json.py
@@ -6,11 +6,11 @@
     "number": 1,
     "string": "f\"oo",
     "arr": [1, 2, 3],
-    "nested": {"a": "b"},
-    "arr_mix": [1, "a", {"arr_mix_nested": {}}],
+    "nested": { "a": "b" },
+    "arr_mix": [1, "a", { "arr_mix_nested": {} }],
     "boolean": False
 }
-headers = {"content-type": "application/json"}
+headers = { "content-type": "application/json" }
 
 response = requests.request("POST", url, json=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/cookies.py b/test/fixtures/output/python/requests/cookies.py
@@ -2,7 +2,7 @@
 
 url = "http://mockbin.com/har"
 
-headers = {"cookie": "foo=bar; bar=baz"}
+headers = { "cookie": "foo=bar; bar=baz" }
 
 response = requests.request("POST", url, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/full.py b/test/fixtures/output/python/requests/full.py
@@ -2,7 +2,11 @@
 
 url = "http://mockbin.com/har"
 
-querystring = {"foo":["bar","baz"],"baz":"abc","key":"value"}
+querystring = {
+    "foo": ["bar", "baz"],
+    "baz": "abc",
+    "key": "value"
+}
 
 payload = "foo=bar"
 headers = {
diff --git a/test/fixtures/output/python/requests/jsonObj-multiline.py b/test/fixtures/output/python/requests/jsonObj-multiline.py
@@ -2,8 +2,8 @@
 
 url = "http://mockbin.com/har"
 
-payload = {"foo": "bar"}
-headers = {"content-type": "application/json"}
+payload = { "foo": "bar" }
+headers = { "content-type": "application/json" }
 
 response = requests.request("POST", url, json=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/jsonObj-null-value.py b/test/fixtures/output/python/requests/jsonObj-null-value.py
@@ -2,8 +2,8 @@
 
 url = "http://mockbin.com/har"
 
-payload = {"foo": None}
-headers = {"content-type": "application/json"}
+payload = { "foo": None }
+headers = { "content-type": "application/json" }
 
 response = requests.request("POST", url, json=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/multipart-data.py b/test/fixtures/output/python/requests/multipart-data.py
@@ -3,7 +3,7 @@
 url = "http://mockbin.com/har"
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nHello World\r\n-----011000010111000001101001--\r\n"
-headers = {"content-type": "multipart/form-data; boundary=---011000010111000001101001"}
+headers = { "content-type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 response = requests.request("POST", url, data=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/multipart-file.py b/test/fixtures/output/python/requests/multipart-file.py
@@ -3,7 +3,7 @@
 url = "http://mockbin.com/har"
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\n\r\n-----011000010111000001101001--\r\n"
-headers = {"content-type": "multipart/form-data; boundary=---011000010111000001101001"}
+headers = { "content-type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 response = requests.request("POST", url, data=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/multipart-form-data.py b/test/fixtures/output/python/requests/multipart-form-data.py
@@ -3,7 +3,7 @@
 url = "http://mockbin.com/har"
 
 payload = "-----011000010111000001101001\r\nContent-Disposition: form-data; name=\"foo\"\r\n\r\nbar\r\n-----011000010111000001101001--\r\n"
-headers = {"Content-Type": "multipart/form-data; boundary=---011000010111000001101001"}
+headers = { "Content-Type": "multipart/form-data; boundary=---011000010111000001101001" }
 
 response = requests.request("POST", url, data=payload, headers=headers)
 
diff --git a/test/fixtures/output/python/requests/nested.py b/test/fixtures/output/python/requests/nested.py
@@ -2,7 +2,11 @@
 
 url = "http://mockbin.com/har"
 
-querystring = {"foo[bar]":"baz,zap","fiz":"buz","key":"value"}
+querystring = {
+    "foo[bar]": "baz,zap",
+    "fiz": "buz",
+    "key": "value"
+}
 
 response = requests.request("GET", url, params=querystring)
 
diff --git a/test/fixtures/output/python/requests/query.py b/test/fixtures/output/python/requests/query.py
@@ -2,7 +2,11 @@
 
 url = "http://mockbin.com/har"
 
-querystring = {"foo":["bar","baz"],"baz":"abc","key":"value"}
+querystring = {
+    "foo": ["bar", "baz"],
+    "baz": "abc",
+    "key": "value"
+}
 
 response = requests.request("GET", url, params=querystring)
 
diff --git a/test/fixtures/output/python/requests/text-plain.py b/test/fixtures/output/python/requests/text-plain.py
@@ -3,7 +3,7 @@
 url = "http://mockbin.com/har"
 
 payload = "Hello World"
-headers = {"content-type": "text/plain"}
+headers = { "content-type": "text/plain" }
 
 response = requests.request("POST", url, data=payload, headers=headers)
 
diff --git a/test/targets/python/requests.js b/test/targets/python/requests.js
@@ -13,7 +13,7 @@ module.exports = function (HTTPSnippet) {
 
 url = "http://mockbin.com/har"
 
-querystring = {"param":"value"}
+querystring = { "param": "value" }
 
 response = requests.request("GET", url, params=querystring)
 

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ function concatValues (concatType, values, pretty, indentation, indentLevel) {`
`25`	`25`
`26`	`26`	`if (pretty) {`
`27`	`27`	`return openingBrace + '\n' + currentIndent + values.join(join) + '\n' + closingBraceIndent + closingBrace`
	`28`	`+ } else if (concatType === 'object' && values.length > 0) {`
	`29`	`+ return openingBrace + ' ' + values.join(join) + ' ' + closingBrace`
`28`	`30`	`} else {`
`29`	`31`	`return openingBrace + values.join(join) + closingBrace`
`30`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ module.exports = function (source, options) {`
`40`	`40`	`const headerCount = Object.keys(headers).length`
`41`	`41`	`if (headerCount === 1) {`
`42`	`42`	`for (const header in headers) {`
`43`		`- code.push('headers = { \'%s\': "%s" }', header, headers[header])`
	`43`	`+ code.push('headers = { "%s": "%s" }', header, headers[header])`
`44`	`44`	`.blank()`
`45`	`45`	`}`
`46`	`46`	`} else if (headerCount > 1) {`
`@@ -50,9 +50,9 @@ module.exports = function (source, options) {`
`50`	`50`
`51`	`51`	`for (const header in headers) {`
`52`	`52`	`if (count++ !== headerCount) {`
`53`		`- code.push(' \'%s\': "%s",', header, headers[header])`
	`53`	`+ code.push(' "%s": "%s",', header, headers[header])`
`54`	`54`	`} else {`
`55`		`- code.push(' \'%s\': "%s"', header, headers[header])`
	`55`	`+ code.push(' "%s": "%s"', header, headers[header])`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`conn = http.client.HTTPConnection("mockbin.com")`
`4`	`4`
`5`	`5`	`headers = {`
`6`		`- 'accept': "application/json",`
`7`		`- 'x-foo': "Bar"`
	`6`	`+ "accept": "application/json",`
	`7`	`+ "x-foo": "Bar"`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`conn.request("GET", "/har", headers=headers)`