Merging the py3k-pep3137 branch back into the py3k branch.

No detailed change log; just check out the change log for the py3k-pep3137
branch.  The most obvious changes:

  - str8 renamed to bytes (PyString at the C level);
  - bytes renamed to buffer (PyBytes at the C level);
  - PyString and PyUnicode are no longer compatible.

I.e. we now have an immutable bytes type and a mutable bytes type.

The behavior of PyString was modified quite a bit, to make it more
bytes-like.  Some changes are still on the to-do list.

1 files changed, 2 insertions, 2 deletions

diff --git a/Lib/sre_parse.py b/Lib/sre_parse.py
index bf3e23f..fa0b8aa 100644
--- a/Lib/sre_parse.py
+++ b/Lib/sre_parse.py
@@ -192,14 +192,14 @@ class Tokenizer:
         char = self.string[self.index:self.index+1]
         # Special case for the str8, since indexing returns a integer
         # XXX This is only needed for test_bug_926075 in test_re.py
-        if isinstance(self.string, str8):
+        if isinstance(self.string, bytes):
             char = chr(char)
         if char == "\\":
             try:
                 c = self.string[self.index + 1]
             except IndexError:
                 raise error("bogus escape (end of line)")
-            if isinstance(self.string, str8):
+            if isinstance(self.string, bytes):
                 char = chr(c)
             char = char + c
         self.index = self.index + len(char)