[pypy-commit] pypy default: Don't allow mixing of SomeChar and SomeUnicodeCodePoint.

Manuel Jacob noreply at buildbot.pypy.org
Wed Jan 15 18:49:11 CET 2014


Author: Manuel Jacob
Branch: 
Changeset: r68686:61380dc9c4fb
Date: 2014-01-15 18:48 +0100
http://bitbucket.org/pypy/pypy/changeset/61380dc9c4fb/

Log:	Don't allow mixing of SomeChar and SomeUnicodeCodePoint.

diff --git a/rpython/annotator/binaryop.py b/rpython/annotator/binaryop.py
--- a/rpython/annotator/binaryop.py
+++ b/rpython/annotator/binaryop.py
@@ -435,11 +435,6 @@
         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()


More information about the pypy-commit mailing list