python
diff --git a/‎.travis.yml
+2 b/‎.travis.yml
+2
diff --git a/‎stdlib/2/SocketServer.pyi
-1 b/‎stdlib/2/SocketServer.pyi
-1
diff --git a/‎stdlib/2/SocketServer.pyi
+99 b/‎stdlib/2/SocketServer.pyi
+99
diff --git a/‎stdlib/2/__builtin__.pyi
+1 b/‎stdlib/2/__builtin__.pyi
+1
diff --git a/‎stdlib/2/builtins.pyi
-1 b/‎stdlib/2/builtins.pyi
-1
@@ -9,6 +9,8 @@ matrix:
       env: TEST_CMD="./tests/mypy_selftest.py"
     - python: "3.5"
       env: TEST_CMD="./tests/mypy_test.py --no-implicit-optional"
+    - python: "3.4"
+      env: TEST_CMD="./tests/check_consistent.py"
     - python: "2.7"
       env: TEST_CMD="./tests/pytype_test.py --num-parallel=4"
       sudo: true
 
@@ -0,0 +1,99 @@
+# NB: SocketServer.pyi and socketserver.pyi must remain consistent!
+# Stubs for socketserver
+
+from typing import Any, BinaryIO, Optional, Tuple, Type
+from socket import SocketType
+import sys
+import types
+
+class BaseServer:
+    address_family = ...  # type: int
+    RequestHandlerClass = ...  # type: type
+    server_address = ...  # type: Tuple[str, int]
+    socket = ...  # type: SocketType
+    allow_reuse_address = ...  # type: bool
+    request_queue_size = ...  # type: int
+    socket_type = ...  # type: int
+    timeout = ...  # type: Optional[float]
+    def __init__(self, server_address: Tuple[str, int],
+                 RequestHandlerClass: type) -> None: ...
+    def fileno(self) -> int: ...
+    def handle_request(self) -> None: ...
+    def serve_forever(self, poll_interval: float = ...) -> None: ...
+    def shutdown(self) -> None: ...
+    def server_close(self) -> None: ...
+    def finish_request(self, request: bytes,
+                       client_address: Tuple[str, int]) -> None: ...
+    def get_request(self) -> None: ...
+    def handle_error(self, request: bytes,
+                     client_address: Tuple[str, int]) -> None: ...
+    def handle_timeout(self) -> None: ...
+    def process_request(self, request: bytes,
+                        client_address: Tuple[str, int]) -> None: ...
+    def server_activate(self) -> None: ...
+    def server_bind(self) -> None: ...
+    def verify_request(self, request: bytes,
+                       client_address: Tuple[str, int]) -> bool: ...
+    if sys.version_info >= (3, 6):
+        def __enter__(self) -> 'BaseServer': ...
+        def __exit__(self, exc_type: Optional[Type[BaseException]],
+                     exc_val: Optional[BaseException],
+                     exc_tb: Optional[types.TracebackType]) -> bool: ...
+    if sys.version_info >= (3, 3):
+        def service_actions(self) -> None: ...
+
+class TCPServer(BaseServer):
+    def __init__(self, server_address: Tuple[str, int],
+                 RequestHandlerClass: type,
+                 bind_and_activate: bool = ...) -> None: ...
+
+class UDPServer(BaseServer):
+    def __init__(self, server_address: Tuple[str, int],
+                 RequestHandlerClass: type,
+                 bind_and_activate: bool = ...) -> None: ...
+
+if sys.platform != 'win32':
+    class UnixStreamServer(BaseServer):
+        def __init__(self, server_address: Tuple[str, int],
+                     RequestHandlerClass: type,
+                     bind_and_activate: bool = ...) -> None: ...
+
+    class UnixDatagramServer(BaseServer):
+        def __init__(self, server_address: Tuple[str, int],
+                     RequestHandlerClass: type,
+                     bind_and_activate: bool = ...) -> None: ...
+
+class ForkingMixIn: ...
+class ThreadingMixIn: ...
+
+class ForkingTCPServer(ForkingMixIn, TCPServer): ...
+class ForkingUDPServer(ForkingMixIn, UDPServer): ...
+class ThreadingTCPServer(ThreadingMixIn, TCPServer): ...
+class ThreadingUDPServer(ThreadingMixIn, UDPServer): ...
+if sys.platform != 'win32':
+    class ThreadingUnixStreamServer(ThreadingMixIn, UnixStreamServer): ...
+    class ThreadingUnixDatagramServer(ThreadingMixIn, UnixDatagramServer): ...
+
+
+class BaseRequestHandler:
+    # Those are technically of types, respectively:
+    # * Union[SocketType, Tuple[bytes, SocketType]]
+    # * Union[Tuple[str, int], str]
+    # But there are some concerns that having unions here would cause
+    # too much inconvenience to people using it (see
+    # https://github.com/python/typeshed/pull/384#issuecomment-234649696)
+    request = ...  # type: Any
+    client_address = ...  # type: Any
+
+    server = ...  # type: BaseServer
+    def setup(self) -> None: ...
+    def handle(self) -> None: ...
+    def finish(self) -> None: ...
+
+class StreamRequestHandler(BaseRequestHandler):
+    rfile = ...  # type: BinaryIO
+    wfile = ...  # type: BinaryIO
+
+class DatagramRequestHandler(BaseRequestHandler):
+    rfile = ...  # type: BinaryIO
+    wfile = ...  # type: BinaryIO
@@ -1,3 +1,4 @@
+# NB: __builtin__.pyi and builtins.pyi must remain consistent!
 # Stubs for builtins (Python 2.7)
 
 # True and False are deliberately omitted because they are keywords in
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+# NB: __builtin__.pyi and builtins.pyi must remain consistent!`
`1`	`2`	`# Stubs for builtins (Python 2.7)`
`2`	`3`
`3`	`4`	`# True and False are deliberately omitted because they are keywords in`