implements "" % other for each of the other types: bytearray, cla…

…ss, complex, dict, frozenset, list
rkrp · Jun 3, 2016 · fd85a49 · fd85a49
1 parent b6fdf00
commit fd85a49
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/batavia/types/Str.js b/batavia/types/Str.js
@@ -131,7 +131,7 @@ String.prototype.__mul__ = function(other) {
 };
 
 String.prototype.__mod__ = function(other) {
-    if (batavia.isinstance(other, [batavia.types.List, batavia.types.Tuple])) {
+    if (batavia.isinstance(other, batavia.types.Tuple)) {
         return batavia._substitute(this, other);
     } else {
         return batavia._substitute(this, [other]);

diff --git a/batavia/utils.js b/batavia/utils.js
@@ -41,9 +41,12 @@ batavia.isinstance = function(obj, type) {
 /*************************************************************************
  * sprintf() implementation
  *************************************************************************/
-
 batavia._substitute = function(format, args) {
     var results = [];
+    var special_case_types = [
+        batavia.types.List,
+        batavia.types.Dict,
+        batavia.types.Bytes];
 
     /* This is the general form regex for a sprintf-like string. */
     var re = /\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-gijosuxX])/g;
@@ -97,6 +100,9 @@ batavia._substitute = function(format, args) {
             results.push(format.slice(lastIndex, match.index));
             lastIndex = re.lastIndex;
             results.push(arg);
+        } else if (    (args.constructor == Array)
+                    && batavia.isinstance(args[0], special_case_types)) {
+            return format
         } else {
             throw new batavia.builtins.TypeError('not all arguments converted during string formatting');
         }

diff --git a/tests/datatypes/test_str.py b/tests/datatypes/test_str.py
@@ -189,13 +189,7 @@ class BinaryStrOperationTests(BinaryOperationTestCase, TranspileTestCase):
         'test_lt_set',
         'test_lt_tuple',
 
-        'test_modulo_bytearray',
         'test_modulo_bytes',
-        'test_modulo_class',
-        'test_modulo_complex',
-        'test_modulo_dict',
-        'test_modulo_frozenset',
-        'test_modulo_list',
         'test_modulo_set',
 
         'test_multiply_bytearray',