Merge pull request #761 from kachick/string-multiply-infects

String#* should infect
topazproject · Jun 24, 2013 · 2ea4c02d7f1d5525e95134193eceb82bb99100c4 · 2ea4c02
2 parents 7c9a9a6 + cb7703f
commit 2ea4c02d7f1d5525e95134193eceb82bb99100c4
Unified Split

Showing with 3 additions and 2 deletions.

+0 −1 spec/tags/core/string/multiply_tags.txt

+3 −1 topaz/objects/stringobject.py
diff --git a/spec/tags/core/string/multiply_tags.txt b/spec/tags/core/string/multiply_tags.txt
@@ -1,2 +1 @@
 fails:String#* returns subclass instances
-fails:String#* always taints the result when self is tainted
diff --git a/topaz/objects/stringobject.py b/topaz/objects/stringobject.py
@@ -475,7 +475,9 @@ def method_plus(self, space, w_obj):
     def method_times(self, space, times):
         if times < 0:
             raise space.error(space.w_ArgumentError, "negative argument")
-        return self.strategy.mul(space, self.str_storage, times)
+        res = self.strategy.mul(space, self.str_storage, times)
+        space.infect(res, self)
+        return res
 
     @classdef.method("<<")
     @classdef.method("concat")