[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r59753:adb6b7eecfa3
Date: 2013-01-05 20:11 +0200
http://bitbucket.org/pypy/pypy/changeset/adb6b7eecfa3/

Log:	merge

diff --git a/pypy/rlib/rsre/rsre_core.py b/pypy/rlib/rsre/rsre_core.py
--- a/pypy/rlib/rsre/rsre_core.py
+++ b/pypy/rlib/rsre/rsre_core.py
@@ -166,6 +166,8 @@
 class StrMatchContext(AbstractMatchContext):
     """Concrete subclass for matching in a plain string."""
 
+    _immutable_fields_ = ["_string"]
+
     def __init__(self, pattern, string, match_start, end, flags):
         AbstractMatchContext.__init__(self, pattern, match_start, end, flags)
         self._string = string
@@ -187,6 +189,8 @@
 class UnicodeMatchContext(AbstractMatchContext):
     """Concrete subclass for matching in a unicode string."""
 
+    _immutable_fields_ = ["_unicodestr"]
+
     def __init__(self, pattern, unicodestr, match_start, end, flags):
         AbstractMatchContext.__init__(self, pattern, match_start, end, flags)
         self._unicodestr = unicodestr