Merge pull request #51 from DanielShaulov/threading

Some fixes to threading

stdlib/2.7/threading.pyi

@@ -1,6 +1,6 @@
 # Stubs for threading
 
-from typing import Any, Dict, Optional, Callable, TypeVar, Union, List, Mapping
+from typing import Any, Optional, Callable, TypeVar, Union, List, Mapping, Sequence
 
 def active_count() -> int: ...
 def activeCount() -> int: ...
@@ -14,9 +14,9 @@ class Thread(object):
     ident = 0
     daemon = False
 
-    def __init__(self, group: Any = ..., target: Any = ...,
-                 name: str = ..., args: tuple = ...,
-                 kwargs: Dict[Any, Any] = ...) -> None: ...
+    def __init__(self, group: Any = ..., target: Callable[..., Any] = ...,
+                 name: str = ..., args: Sequence[Any] = ...,
+                 kwargs: Mapping[str, Any] = ...) -> None: ...
     def start(self) -> None: ...
     def run(self) -> None: ...
     def join(self, timeout: float = ...) -> None: ...
@@ -29,12 +29,11 @@ class Thread(object):
     def isDaemon(self) -> bool: ...
     def setDaemon(self, daemon: bool) -> None: ...
 
-class Timer(object):
-    def __init__(self, interval: float, function: Any,
-                 args: List[Any] = ...,
-                 kwargs: Mapping[Any, Any] = ...) -> None: ...
-    def cancel(self) -> None: ...
-    def start(self) -> None: ...
+class Timer(Thread):
+    def __init__(self, interval: float, function: Callable[..., Any],
+                 args: Sequence[Any] = ...,
+                 kwargs: Mapping[str, Any] = ...) -> None: ...
+    def cancel(self) -> None : ...
 
 # TODO: better type
 def settrace(func: Callable[[Any, str, Any], Any]) -> None: ...
@@ -44,11 +43,7 @@ def stack_size(size: int = ...) -> None: ...
 class ThreadError(Exception):
     pass
 
-class local(object):
-    # TODO: allows arbitrary parameters...
-    def __getattr__(self, name: str) -> Any: ...
-    def __setattr__(self, name: str, value: Any) -> None: ...
-    def __delattr__(self, name: str) -> None: ...
+class local(Any): ...
 
 class Event(object):
     def is_set(self) -> bool: ...

stdlib/3/threading.pyi

@@ -2,16 +2,16 @@
 
 # NOTE: These are incomplete!
 
-from typing import Any, Dict, Optional, Callable, TypeVar, Union
+from typing import Any, Optional, Callable, TypeVar, Union, Mapping, Sequence
 
 class Thread:
     name = ...  # type: str
     ident = 0
     daemon = False
 
-    def __init__(self, group: Any = ..., target: Any = ..., args: Any = ...,
-                 kwargs: Dict[Any, Any] = ...,
-                 verbose: Any = ...) -> None: ...
+    def __init__(self, group: Any = ..., target: Callable[..., Any] = ...,
+                 name: str = ..., args: Sequence[Any] = ...,
+                 kwargs: Mapping[str, Any] = ..., daemon: bool = ...) -> None: ...
     def start(self) -> None: ...
     def run(self) -> None: ...
     def join(self, timeout: float = ...) -> None: ...
@@ -23,11 +23,13 @@ class Thread:
     def isDaemon(self) -> bool: ...
     def setDaemon(self, daemon: bool) -> None: ...
 
-class local(object):
-    # TODO: allows arbitrary parameters...
-    def __getattr__(self, name: str) -> Any: ...
-    def __setattr__(self, name: str, value: Any) -> None: ...
-    def __delattr__(self, name: str) -> None: ...
+class Timer(Thread):
+    def __init__(self, interval: float, function: Callable[..., Any],
+                 args: Sequence[Any] = ...,
+                 kwargs: Mapping[str, Any] = ...) -> None: ...
+    def cancel(self) -> None : ...
+
+class local(Any): ...
 
 class Event:
     def is_set(self) -> bool: ...
@@ -60,8 +62,3 @@ class Condition:
     def wait_for(self, predicate: Callable[[], _T], timeout: float = ...) -> Union[_T, bool]: ...
     def __enter__(self) -> bool: ...
     def __exit__(self, *args): ...
-
-class Timer(Thread):
-    def __init__(self, interval: float, function: Callable[..., Any],
-                 args: Any = ..., kwargs: Dict[Any, Any] = ...) -> None: ...
-    def cancel(self) -> None : ...

stdlib/3/types.pyi

@@ -67,7 +67,7 @@ class MappingProxyType:
     def __getitem__(self, key: str) -> Any: ...
     def __iter__(self) -> Iterator[str]: ...
     def __len__(self) -> int: ...
-class SimpleNamespace: ...
+class SimpleNamespace(Any): ...
 
 class GeneratorType:
     gi_code = ...  # type: CodeType