Merge branch 'italomaia-bytearray-datatype'

artemon87 · Oct 20, 2016 · c2d0b08 · c2d0b08
2 parents e3c31c0 + 8480431
commit c2d0b08
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/python/common/org/python/types/Int.java b/python/common/org/python/types/Int.java
@@ -230,13 +230,15 @@ public org.python.Object __mul__(org.python.Object other) {
             return other.__mul__(this);
         } else if (other instanceof org.python.types.Bytes){
             byte[] other_value = ((org.python.types.Bytes) other).value;
+        } else if (other instanceof org.python.types.ByteArray) {
+            byte[] other_value = ((org.python.types.ByteArray) other).value;
             int value = Math.max(0, (int) this.value);
             int len = other_value.length;
             byte[] bytes = new byte[value * len];
             for(int i=0; i < value; i++){
                 System.arraycopy(other_value, 0, bytes, i * len, len);
             }
-            return new org.python.types.Bytes(bytes);
+            return new org.python.types.ByteArray(bytes);
         }
         throw new org.python.exceptions.TypeError("unsupported operand type(s) for *: 'int' and '" + other.typeName() + "'");
     }

diff --git a/tests/datatypes/test_int.py b/tests/datatypes/test_int.py
@@ -65,7 +65,6 @@ class BinaryIntOperationTests(BinaryOperationTestCase, TranspileTestCase):
         'test_modulo_complex',
         'test_modulo_frozenset',
 
-        'test_multiply_bytearray',
         'test_multiply_class',
         'test_multiply_complex',
         'test_multiply_frozenset',