From fb96ee8e50385dd03aac7839b97939eb0788e29f Mon Sep 17 00:00:00 2001
From: David Fisher <ddfisher@dropbox.com>
Date: Fri, 3 Jun 2016 17:41:01 -0700
Subject: [PATCH] Revert "replace re patterns AnyStr with Union[str, unicode]"

This reverts commit ba2c8d95ec0d6d3f774a8c0aa22e5a6ea02e653b.
This commit introduced some bugs (it used Pattern[Union[str, unicode]]
when it would need to be Union[Pattern[str], Pattern[unicode]]), and
- on further discussion - it's unclear if we want to allow this
  additional flexibility.  I'm reverting this diff for now, but we'll
revisit this after deciding on the upcoming proposal about how implicit
bytes/unicode conversions should be handled when typing Python 2.
---
 stdlib/2.7/re.pyi | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/stdlib/2.7/re.pyi b/stdlib/2.7/re.pyi
index 116bf29c2..7c47bcd89 100644
--- a/stdlib/2.7/re.pyi
+++ b/stdlib/2.7/re.pyi
@@ -6,7 +6,7 @@
 
 from typing import (
     List, Iterator, overload, Callable, Tuple, Sequence, Dict,
-    Generic, AnyStr, Match, Pattern, Union
+    Generic, AnyStr, Match, Pattern
 )
 
 # ----- re variables and constants -----
@@ -34,63 +34,63 @@ def compile(pattern: AnyStr, flags: int = ...) -> Pattern[AnyStr]: ...
 def compile(pattern: Pattern[AnyStr], flags: int = ...) -> Pattern[AnyStr]: ...
 
 @overload
-def search(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
+def search(pattern: AnyStr, string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
 @overload
 def search(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
 
 @overload
-def match(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
+def match(pattern: AnyStr, string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
 @overload
-def match(pattern: Pattern[Union[str, unicode]], string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
+def match(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> Match[AnyStr]: ...
 
 @overload
-def split(pattern: Union[str, unicode], string: AnyStr,
+def split(pattern: AnyStr, string: AnyStr,
           maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ...
 @overload
-def split(pattern: Pattern[Union[str, unicode]], string: AnyStr,
+def split(pattern: Pattern[AnyStr], string: AnyStr,
           maxsplit: int = ..., flags: int = ...) -> List[AnyStr]: ...
 
 @overload
-def findall(pattern: Union[str, unicode], string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
+def findall(pattern: AnyStr, string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
 @overload
-def findall(pattern: Pattern[Union[str, unicode]], string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
+def findall(pattern: Pattern[AnyStr], string: AnyStr, flags: int = ...) -> List[AnyStr]: ...
 
 # Return an iterator yielding match objects over all non-overlapping matches
 # for the RE pattern in string. The string is scanned left-to-right, and
 # matches are returned in the order found. Empty matches are included in the
 # result unless they touch the beginning of another match.
 @overload
-def finditer(pattern: Union[str, unicode], string: AnyStr,
+def finditer(pattern: AnyStr, string: AnyStr,
              flags: int = ...) -> Iterator[Match[AnyStr]]: ...
 @overload
-def finditer(pattern: Pattern[Union[str, unicode]], string: AnyStr,
+def finditer(pattern: Pattern[AnyStr], string: AnyStr,
              flags: int = ...) -> Iterator[Match[AnyStr]]: ...
 
 @overload
-def sub(pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ...,
+def sub(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ...,
         flags: int = ...) -> AnyStr: ...
 @overload
-def sub(pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr],
+def sub(pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr],
         string: AnyStr, count: int = ..., flags: int = ...) -> AnyStr: ...
 @overload
-def sub(pattern: Pattern[Union[str, unicode]], repl: AnyStr, string: AnyStr, count: int = ...,
+def sub(pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ...,
         flags: int = ...) -> AnyStr: ...
 @overload
-def sub(pattern: Pattern[Union[str, unicode]], repl: Callable[[Match[AnyStr]], AnyStr],
+def sub(pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr],
         string: AnyStr, count: int = ..., flags: int = ...) -> AnyStr: ...
 
 @overload
-def subn(pattern: Union[str, unicode], repl: AnyStr, string: AnyStr, count: int = ...,
+def subn(pattern: AnyStr, repl: AnyStr, string: AnyStr, count: int = ...,
          flags: int = ...) -> Tuple[AnyStr, int]: ...
 @overload
-def subn(pattern: Union[str, unicode], repl: Callable[[Match[AnyStr]], AnyStr],
+def subn(pattern: AnyStr, repl: Callable[[Match[AnyStr]], AnyStr],
          string: AnyStr, count: int = ...,
          flags: int = ...) -> Tuple[AnyStr, int]: ...
 @overload
-def subn(pattern: Pattern[Union[str, unicode]], repl: AnyStr, string: AnyStr, count: int = ...,
+def subn(pattern: Pattern[AnyStr], repl: AnyStr, string: AnyStr, count: int = ...,
          flags: int = ...) -> Tuple[AnyStr, int]: ...
 @overload
-def subn(pattern: Pattern[Union[str, unicode]], repl: Callable[[Match[AnyStr]], AnyStr],
+def subn(pattern: Pattern[AnyStr], repl: Callable[[Match[AnyStr]], AnyStr],
          string: AnyStr, count: int = ...,
          flags: int = ...) -> Tuple[AnyStr, int]: ...