fix(Python bindings): Fix spacing and regnerate test snapshots

stencila · Jul 23, 2019 · 7050b5c · 7050b5c
1 parent 1e7a6c0
commit 7050b5c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 19 deletions.
diff --git a/src/python.ts b/src/python.ts
@@ -34,10 +34,10 @@ async function build(): Promise<void> {
   globals = []
   const classesCode = types(schemas)
     .map(classGenerator)
-    .join('')
+    .join('\n\n')
   const unionsCode = unions(schemas)
     .map(unionGenerator)
-    .join('')
+    .join('\n\n')
   const globalsCode = globals.join('\n')
 
   const code = `from typing import Any, Dict, List as Array, Optional, Union
@@ -139,7 +139,7 @@ export function classGenerator(schema: Schema): string {
     )
     .join('\n')
 
-  const init = `    def __init__(${initPars}) -> None:\n${superCall}\n${initSetters}\n\n`
+  const init = `    def __init__(${initPars}) -> None:\n${superCall}\n${initSetters}`
 
   return clas + (attrs.length > 0 ? attrs + '\n\n' : '') + init + '\n'
 }
@@ -149,8 +149,11 @@ export function classGenerator(schema: Schema): string {
  */
 export function unionGenerator(schema: Schema): string {
   const { title, description } = schema
-  let code = `"""\n${description}\n"""\n`
-  code += `${title} = ${schemaToType(schema)}\n\n`
+  let code = ''
+  if (description !== undefined) {
+    code += `"""\n${formatDocstring(description)}\n"""\n`
+  }
+  code += `${title} = ${schemaToType(schema)}\n`
   return code
 }
 

diff --git a/tests/__file_snapshots__/BlockContent.py b/tests/__file_snapshots__/BlockContent.py
@@ -2,4 +2,3 @@
 Block content.
 """
 BlockContent = Union["CodeBlock", "CodeChunk", "Heading", "List", "ListItem", "Paragraph", "QuoteBlock", "Table", "ThematicBreak"]
-
diff --git a/tests/__file_snapshots__/Person.py b/tests/__file_snapshots__/Person.py
@@ -43,16 +43,25 @@ def __init__(
             name=name,
             url=url
         )
-        if address is not None: self.address = address
-        if affiliations is not None: self.affiliations = affiliations
-        if emails is not None: self.emails = emails
-        if familyNames is not None: self.familyNames = familyNames
-        if funders is not None: self.funders = funders
-        if givenNames is not None: self.givenNames = givenNames
-        if honorificPrefix is not None: self.honorificPrefix = honorificPrefix
-        if honorificSuffix is not None: self.honorificSuffix = honorificSuffix
-        if jobTitle is not None: self.jobTitle = jobTitle
-        if memberOf is not None: self.memberOf = memberOf
-        if telephoneNumbers is not None: self.telephoneNumbers = telephoneNumbers
-
-
+        if address is not None:
+            self.address = address
+        if affiliations is not None:
+            self.affiliations = affiliations
+        if emails is not None:
+            self.emails = emails
+        if familyNames is not None:
+            self.familyNames = familyNames
+        if funders is not None:
+            self.funders = funders
+        if givenNames is not None:
+            self.givenNames = givenNames
+        if honorificPrefix is not None:
+            self.honorificPrefix = honorificPrefix
+        if honorificSuffix is not None:
+            self.honorificSuffix = honorificSuffix
+        if jobTitle is not None:
+            self.jobTitle = jobTitle
+        if memberOf is not None:
+            self.memberOf = memberOf
+        if telephoneNumbers is not None:
+            self.telephoneNumbers = telephoneNumbers