apply conditionals (#417)

stdlib/2and3/logging/__init__.pyi

@@ -241,15 +241,13 @@ class LoggerAdapter:
         def hasHandlers(self) -> bool: ...
 
 
-# TODO uncomment when mypy handle conditionals
-#if sys.version_info >= (3,):
-#    def getLogger(name: Optional[str] = ...) -> Logger: ...
-#else:
-#    @overload
-#    def getLogger() -> Logger: ...
-#    @overload
-#    def getLogger(name: str) -> Logger: ...
-def getLogger(name: Optional[str] = ...) -> Logger: ...
+if sys.version_info >= (3,):
+    def getLogger(name: Optional[str] = ...) -> Logger: ...
+else:
+    @overload
+    def getLogger() -> Logger: ...
+    @overload
+    def getLogger(name: str) -> Logger: ...
 def getLoggerClass() -> type: ...
 if sys.version_info >= (3,):
     def getLogRecordFactory() -> Callable[..., LogRecord]: ...
@@ -303,23 +301,18 @@ def getLevelName(lvl: int) -> str: ...
 
 def makeLogRecord(attrdict: Mapping[str, Any]) -> LogRecord: ...
 
-# TODO uncomment when mypy handle conditionals
-#if sys.version_info >= (3,):
-#    def basicConfig(*, filename: str = ..., filemode: str = ...,
-#                    format: str = ..., datefmt: str = ..., style: str = ...,
-#                    level: int = ..., stream: IO[str] = ...,
-#                    handlers: Iterable[Handler]) -> None: ...
-#else:
-#    @overload
-#    def basicConfig() -> None: ...
-#    @overload
-#    def basicConfig(*, filename: str = ..., filemode: str = ...,
-#                    format: str = ..., datefmt: str = ...,
-#                    level: int = ..., stream: IO[str] = ...) -> None: ...
-def basicConfig(*, filename: str = ..., filemode: str = ...,
-                format: str = ..., datefmt: str = ..., style: str = ...,
-                level: int = ..., stream: IO[str] = ...,
-                handlers: Iterable[Handler]) -> None: ...
+if sys.version_info >= (3,):
+    def basicConfig(*, filename: str = ..., filemode: str = ...,
+                    format: str = ..., datefmt: str = ..., style: str = ...,
+                    level: int = ..., stream: IO[str] = ...,
+                    handlers: Iterable[Handler]) -> None: ...
+else:
+    @overload
+    def basicConfig() -> None: ...
+    @overload
+    def basicConfig(*, filename: str = ..., filemode: str = ...,
+                    format: str = ..., datefmt: str = ...,
+                    level: int = ..., stream: IO[str] = ...) -> None: ...
 def shutdown() -> None: ...
 
 def setLoggerClass(klass: type) -> None: ...

stdlib/2and3/logging/config.pyi

@@ -2,13 +2,12 @@
 
 from typing import Any, Callable, Dict, Optional, IO, Union
 import sys
-# TODO uncomment when mypy handle conditionals
-#if sys.version_info >= (3,):
-#    from configparser import RawConfigParser
-#else:
-#    from ConfigParser import RawConfigParser
-# TODO add RawConfigParser to configparser stubs
-RawConfigParser = Any
+if sys.version_info >= (3,):
+    #from configparser import RawConfigParser
+    # TODO add RawConfigParser to configparser stubs
+    RawConfigParser = Any
+else:
+    from ConfigParser import RawConfigParser
 
 
 def dictConfig(config: Dict[str, Any]) -> None: ...

stdlib/2and3/logging/handlers.pyi

@@ -3,12 +3,10 @@
 from typing import Any, Callable, Optional, Tuple, Union, overload
 from logging import Handler, FileHandler, LogRecord
 import datetime
-# TODO uncomment when mypy handle conditionals
-#if sys.version_info >= (3,):
-#    from queue import Queue
-#else:
-#    from Queue import Queue
-Queue = Any
+if sys.version_info >= (3,):
+    from queue import Queue
+else:
+    from Queue import Queue
 from socket import SocketType
 # TODO update socket stubs to add SocketKind
 SocketKind = int