Merge stubs for sqlite3 (#2026)

As promised in #2014.

There are virtually no real changes between Python 2 and 3 in this module, but the stub had accumulated some meaningless differences. I also fixed a few incorrect types.

Author: JelleZijlstra

stdlib/2/sqlite3/dbapi2.pyi

@@ -2,26 +2,25 @@
 # based heavily on Andrey Vlasovskikh's python-skeletons https://github.com/JetBrains/python-skeletons/blob/master/sqlite3.py
 
 import sys
-from typing import Any, Union, List, Iterator, Optional, TypeVar, Callable
-from datetime import time, datetime
-from collections import Iterable
+from typing import Any, Callable, Iterable, Iterator, List, Optional, Text, Tuple, Type, TypeVar, Union
+from datetime import date, time, datetime
 
 _T = TypeVar('_T')
 
-paramstyle = ...  # type: str
-threadsafety = ...  # type: int
-apilevel = ...  # type: str
-Date = ...  # type: datetime
-Time = ...  # type: time
-Timestamp = ...  # type: datetime
+paramstyle: str
+threadsafety: int
+apilevel: str
+Date = date
+Time = time
+Timestamp = datetime
 
 def DateFromTicks(ticks): ...
 def TimeFromTicks(ticks): ...
 def TimestampFromTicks(ticks): ...
 
-version_info = ...  # type: Any
-sqlite_version_info = ...  # type: Any
-Binary = ...  # type: Any
+version_info: str
+sqlite_version_info: Tuple[int, int, int]
+Binary: Type[Any]
 
 def register_adapters_and_converters(): ...
 
@@ -69,21 +68,33 @@ version = ...  # type: str
 def adapt(obj, protocol, alternate): ...
 def complete_statement(sql: str) -> bool: ...
 if sys.version_info >= (3, 4):
-    def connect(database: Union[bytes, str], timeout: float = ..., detect_types: int = ..., isolation_level: Union[str, None] = ..., check_same_thread: bool = ..., factory: Union[Connection, None] = ..., cached_statements: int = ..., uri: bool = ...) -> Connection: ...
+    def connect(database: Union[bytes, Text],
+                timeout: float = ...,
+                detect_types: int = ...,
+                isolation_level: Optional[str] = ...,
+                check_same_thread: bool = ...,
+                factory: Optional[Type[Connection]] = ...,
+                cached_statements: int = ...,
+                uri: bool = ...) -> Connection: ...
 else:
-    def connect(database: Union[bytes, str], timeout: float = ..., detect_types: int = ..., isolation_level: Union[str, None] = ..., check_same_thread: bool = ..., factory: Union[Connection, None] = ..., cached_statements: int = ...) -> Connection: ...
+    def connect(database: Union[bytes, Text],
+                timeout: float = ...,
+                detect_types: int = ...,
+                isolation_level: Optional[str] = ...,
+                check_same_thread: bool = ...,
+                factory: Optional[Type[Connection]] = ...,
+                cached_statements: int = ...) -> Connection: ...
 def enable_callback_tracebacks(flag: bool) -> None: ...
 def enable_shared_cache(do_enable: int) -> None: ...
-def register_adapter(type: _T, callable: Callable[[_T], Union[int, float, str, bytes]]) -> None: ...
-# TODO: sqlite3.register_converter.__doc__ specifies callable as unknown
+def register_adapter(type: Type[_T], callable: Callable[[_T], Union[int, float, str, bytes]]) -> None: ...
 def register_converter(typename: str, callable: Callable[[bytes], Any]) -> None: ...
 
-class Cache:
+class Cache(object):
     def __init__(self, *args, **kwargs) -> None: ...
     def display(self, *args, **kwargs) -> None: ...
     def get(self, *args, **kwargs) -> None: ...
 
-class Connection:
+class Connection(object):
     DataError = ...  # type: Any
     DatabaseError = ...  # type: Any
     Error = ...  # type: Any
@@ -109,7 +120,7 @@ class Connection:
     def execute(self, sql: str, parameters: Iterable = ...) -> Cursor: ...
     # TODO: please check in executemany() if seq_of_parameters type is possible like this
     def executemany(self, sql: str, seq_of_parameters: Iterable[Iterable]) -> Cursor: ...
-    def executescript(self, sql_script: Union[bytes, str]) -> Cursor: ...
+    def executescript(self, sql_script: Union[bytes, Text]) -> Cursor: ...
     def interrupt(self, *args, **kwargs) -> None: ...
     def iterdump(self, *args, **kwargs) -> None: ...
     def rollback(self, *args, **kwargs) -> None: ...
@@ -142,7 +153,7 @@ class Cursor(Iterator[Any]):
     def close(self, *args, **kwargs): ...
     def execute(self, sql: str, parameters: Iterable = ...) -> Cursor: ...
     def executemany(self, sql: str, seq_of_parameters: Iterable[Iterable]): ...
-    def executescript(self, sql_script: Union[bytes, str]) -> Cursor: ...
+    def executescript(self, sql_script: Union[bytes, Text]) -> Cursor: ...
     def fetchall(self) -> List[Any]: ...
     def fetchmany(self, size: Optional[int] = ...) -> List[Any]: ...
     def fetchone(self) -> Any: ...
@@ -168,7 +179,7 @@ class NotSupportedError(DatabaseError): ...
 
 class OperationalError(DatabaseError): ...
 
-class OptimizedUnicode:
+class OptimizedUnicode(object):
     maketrans = ...  # type: Any
     def __init__(self, *args, **kwargs): ...
     def capitalize(self, *args, **kwargs): ...
@@ -233,12 +244,12 @@ class OptimizedUnicode:
     def __rmod__(self, other): ...
     def __rmul__(self, other): ...
 
-class PrepareProtocol:
+class PrepareProtocol(object):
     def __init__(self, *args, **kwargs): ...
 
 class ProgrammingError(DatabaseError): ...
 
-class Row:
+class Row(object):
     def __init__(self, *args, **kwargs): ...
     def keys(self, *args, **kwargs): ...
     def __eq__(self, other): ...
@@ -252,7 +263,7 @@ class Row:
     def __lt__(self, other): ...
     def __ne__(self, other): ...
 
-class Statement:
+class Statement(object):
     def __init__(self, *args, **kwargs): ...
 
 class Warning(Exception): ...