@darabonba/python-generator 2.0.3 → 2.0.4

package/ChangeLog.md

@@ -1,5 +1,8 @@
 # ChangeLog
 
+# 2.0.3
+- Fixed the writable & readable assert logic.
+
 # 2.0.3
 - Optimized the directory structure of models and exceptions.
 

package/lib/builtin.js

@@ -401,24 +401,18 @@ class Converter {
 
   readable(ast) {
     const expr = ast.args[0];
-    this.generator.usedTypes.push('StringIO');
-    this.generator.imports.push({
-      className: 'json',
-    });
-    this.generator.emit('StringIO(json.dumps(');
+    this.generator.imports.push(_getImport(`${CORE}Stream`));
+    this.generator.emit(`${CORE}Stream.to_readable(`);
     this.generator.visitExpr(expr);
-    this.generator.emit('))');
+    this.generator.emit(')');
   }
 
   writable(ast) {
     const expr = ast.args[0];
-    this.generator.usedTypes.push('BytesIO');
-    this.generator.imports.push({
-      className: 'json',
-    });
-    this.generator.emit('BytesIO(json.dumps(');
+    this.generator.imports.push(_getImport(`${CORE}Stream`));
+    this.generator.emit(`${CORE}Stream.to_writable(`);
     this.generator.visitExpr(expr);
-    this.generator.emit(').encode(\'utf-8\'))');
+    this.generator.emit(')');
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "The darabonba generator for Python",
   "main": "lib/generator.js",
   "directories": {

package/tests/expected/builtin/tea_python_tests/client.py

@@ -16,7 +16,7 @@ from darabonba.utils.stream import Stream as DaraStream
 from darabonba.url import Url as DaraURL 
 from darabonba.utils.xml import XML as DaraXML 
 import sys 
-from typing import List, Any, BytesIO, StringIO
+from typing import List, Any
 
 
 class Client:
@@ -618,8 +618,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)
@@ -669,8 +669,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)

package/tests/output/builtin/tea_python_tests/client.py

@@ -16,7 +16,7 @@ from darabonba.utils.stream import Stream as DaraStream
 from darabonba.url import Url as DaraURL 
 from darabonba.utils.xml import XML as DaraXML 
 import sys 
-from typing import List, Any, BytesIO, StringIO
+from typing import List, Any
 
 
 class Client:
@@ -618,8 +618,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)
@@ -669,8 +669,8 @@ class Client:
                 'key': 'value'
             }
             obj = maps
-            ws = BytesIO(json.dumps(obj).encode('utf-8'))
-            rs = StringIO(json.dumps(maps))
+            ws = DaraStream.to_writable(obj)
+            rs = DaraStream.to_readable(maps)
             data = rs.read(30)
             if not DaraCore.is_null(data):
                 ws.write(data)