Merge remote-tracking branch 'upstream/master' into makefile-tweaks

6 files changed, 24 insertions, 19 deletions

diff --git a/tests/basics/iter-of-iter.py b/tests/basics/iter-of-iter.py
index ba55356294..70282aa97e 100644
--- a/tests/basics/iter-of-iter.py
+++ b/tests/basics/iter-of-iter.py
@@ -5,4 +5,4 @@ print(list(i))
 i = iter(iter({1:2, 3:4, 5:6}))
 print(sorted(i))
 i = iter(iter({1, 2, 3}))
-print(list(i))
+print(sorted(i))
diff --git a/tests/basics/set1.py b/tests/basics/set1.py
index c54fbd8379..399c33eb68 100644
--- a/tests/basics/set1.py
+++ b/tests/basics/set1.py
@@ -4,4 +4,4 @@ s = {1}
 print(s)
 
 s = {3, 4, 3, 1}
-print(s)
+print(sorted(s))
diff --git a/tests/basics/set_binop.py b/tests/basics/set_binop.py
index d0d0b8027b..1acb810f0f 100644
--- a/tests/basics/set_binop.py
+++ b/tests/basics/set_binop.py
@@ -5,26 +5,26 @@ def r(s):
 sets = [set(), {1}, {1, 2}, {1, 2, 3}, {2, 3}, {2, 3, 5}, {5}, {7}]
 for s in sets:
     for t in sets:
-        print(s, '|', t, '=', r(s | t))
-        print(s, '^', t, '=', r(s ^ t))
-        print(s, '&', t, '=', r(s & t))
-        print(s, '-', t, '=', r(s - t))
+        print(r(s), '|', r(t), '=', r(s | t))
+        print(r(s), '^', r(t), '=', r(s ^ t))
+        print(r(s), '&', r(t), '=', r(s & t))
+        print(r(s), '-', r(t), '=', r(s - t))
         u = s.copy()
         u |= t
-        print(s, "|=", t, '-->', r(u))
+        print(r(s), "|=", r(t), '-->', r(u))
         u = s.copy()
         u ^= t
-        print(s, "^=", t, '-->', r(u))
+        print(r(s), "^=", r(t), '-->', r(u))
         u = s.copy()
         u &= t
-        print(s, "&=", t, "-->", r(u))
+        print(r(s), "&=", r(t), "-->", r(u))
         u = s.copy()
         u -= t
-        print(s, "-=", t, "-->", r(u))
+        print(r(s), "-=", r(t), "-->", r(u))
 
-        print(s, '==', t, '=', s == t)
-        print(s, '!=', t, '=', s != t)
-        print(s, '>', t, '=', s > t)
-        print(s, '>=', t, '=', s >= t)
-        print(s, '<', t, '=', s < t)
-        print(s, '<=', t, '=', s <= t)
+        print(r(s), '==', r(t), '=', s == t)
+        print(r(s), '!=', r(t), '=', s != t)
+        print(r(s), '>', r(t), '=', s > t)
+        print(r(s), '>=', r(t), '=', s >= t)
+        print(r(s), '<', r(t), '=', s < t)
+        print(r(s), '<=', r(t), '=', s <= t)
diff --git a/tests/basics/set_symmetric_difference.py b/tests/basics/set_symmetric_difference.py
index acf298385a..d5f1df1ed7 100644
--- a/tests/basics/set_symmetric_difference.py
+++ b/tests/basics/set_symmetric_difference.py
@@ -1,5 +1,5 @@
-print({1,2}.symmetric_difference({2,3}))
-print({1,2}.symmetric_difference([2,3]))
+print(sorted({1,2}.symmetric_difference({2,3})))
+print(sorted({1,2}.symmetric_difference([2,3])))
 s = {1,2}
 print(s.symmetric_difference_update({2,3}))
 l = list(s)
diff --git a/tests/basics/set_union.py b/tests/basics/set_union.py
index 2adcc972c0..572d12f66b 100644
--- a/tests/basics/set_union.py
+++ b/tests/basics/set_union.py
@@ -1 +1 @@
-print({1}.union({2}))
+print(sorted({1}.union({2})))
diff --git a/tests/basics/string_replace.py b/tests/basics/string_replace.py
index a1d0f973bb..8c4c171807 100644
--- a/tests/basics/string_replace.py
+++ b/tests/basics/string_replace.py
@@ -6,3 +6,8 @@ print("aabbaabbaabbaa".replace("aa", "cc", 3))
 print("a".replace("aa", "bb"))
 print("testingtesting".replace("ing", ""))
 print("testINGtesting".replace("ing", "ING!"))
+
+print("".replace("", "1"))
+print("A".replace("", "1"))
+print("AB".replace("", "1"))
+print("AB".replace("", "12"))