[pypy-commit] pypy default: Backed out changeset 61380dc9c4fb

[Manuel Jacob]

Author: Manuel Jacob
Branch: 
Changeset: r68689:14ff99b7167b
Date: 2014-01-15 21:14 +0100
http://bitbucket.org/pypy/pypy/changeset/14ff99b7167b/

Log:	Backed out changeset 61380dc9c4fb

diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py
--- a/rpython/annotator/binaryop.py
+++ b/rpython/annotator/binaryop.py
@@ -435,6 +435,11 @@
         return SomeChar(no_nul=no_nul)
 
 
+class __extend__(pairtype(SomeChar, SomeUnicodeCodePoint),
+                 pairtype(SomeUnicodeCodePoint, SomeChar)):
+    def union((uchr1, uchr2)):
+        return SomeUnicodeCodePoint()
+
 class __extend__(pairtype(SomeUnicodeCodePoint, SomeUnicodeCodePoint)):
     def union((uchr1, uchr2)):
         return SomeUnicodeCodePoint()