diff --git a/builtins/2.7/strop.pyi b/builtins/2.7/strop.pyi
index b94b632d3..e37abe99e 100644
--- a/builtins/2.7/strop.pyi
+++ b/builtins/2.7/strop.pyi
@@ -1,83 +1,73 @@
 """Stub file for the 'strop' module."""
-# This is an autogenerated file. It serves as a starting point
-# for a more precise manual annotation of this module.
-# Feel free to edit the source below, but remove this header when you do.
 
-from typing import Any, List, Tuple, Dict, Generic
+from typing import List, Sequence
+
+lowercase = ...  # type: str
+uppercase = ...  # type: str
+whitespace = ...  # type: str
 
 def atof(a: str) -> float:
     raise DeprecationWarning()
-    raise ValueError()
 
-def atoi(a: str, *args, **kwargs) -> int:
-    raise DeprecationWarning()
-    raise ValueError()
-
-def atol(a: str, *args, **kwargs) -> long:
-    raise DeprecationWarning()
-    raise ValueError()
-
-def capitalize(*args, **kwargs) -> str:
+def atoi(a: str, base:int = ...) -> int:
     raise DeprecationWarning()
 
-def count(*args, **kwargs) -> int:
+def atol(a: str, base:int = ...) -> long:
     raise DeprecationWarning()
 
-def expandtabs(a, *args, **kwargs) -> str:
+def capitalize(s: str) -> str:
+    raise DeprecationWarning()
+
+def count(s: str, sub: str, start: int = ..., end: int = ...) -> int:
+    raise DeprecationWarning()
+
+def expandtabs(string:str, tabsize:int = ...) -> str:
     raise DeprecationWarning()
     raise OverflowError()
-    raise ValueError()
 
-def find(*args, **kwargs) -> int:
+def find(s: str, sub: str, start: int = ..., end: int = ...) -> int:
     raise DeprecationWarning()
 
-def join(*args, **kwargs) -> Any:
+def join(list: Sequence[str], sep:str = ...) -> str:
     raise DeprecationWarning()
     raise OverflowError()
-    raise TypeError()
 
-def joinfields(*args, **kwargs) -> Any:
+def joinfields(list: Sequence[str], sep:str = ...) -> str:
     raise DeprecationWarning()
     raise OverflowError()
-    raise TypeError()
 
-def lower(*args, **kwargs) -> str:
+def lower(s: str) -> str:
     raise DeprecationWarning()
 
-def lstrip(*args, **kwargs) -> str:
+def lstrip(s: str) -> str:
     raise DeprecationWarning()
 
-def maketrans(*args, **kwargs) -> str:
-    raise ValueError()
+def maketrans(frm: str, to: str) -> str: ...
 
-def replace(*args, **kwargs) -> str:
-    raise DeprecationWarning()
-    raise MemoryError()
-    raise ValueError()
-
-def rfind(*args, **kwargs) -> int:
+def replace(s: str, old: str, new: str, maxsplit:int = ...) -> str:
     raise DeprecationWarning()
 
-def rstrip(*args, **kwargs) -> str:
+def rfind(s: str, sub: str, start: int = ..., end: int = ...) -> int:
     raise DeprecationWarning()
 
-def split(*args, **kwargs) -> List[str]:
-    raise DeprecationWarning()
-    raise ValueError()
-
-def splitfields(*args, **kwargs) -> List[str]:
-    raise DeprecationWarning()
-    raise ValueError()
-
-def strip(*args, **kwargs) -> str:
+def rstrip(s: str) -> str:
     raise DeprecationWarning()
 
-def swapcase(*args, **kwargs) -> str:
+def split(s: str, sep: str, maxsplit: int = ...) -> List[str]:
     raise DeprecationWarning()
 
-def translate(*args, **kwargs) -> str:
+def splitfields(s: str, sep: str, maxsplit: int = ...) -> List[str]:
     raise DeprecationWarning()
-    raise ValueError()
 
-def upper(*args, **kwargs) -> str:
+def strip(s: str) -> str:
     raise DeprecationWarning()
+
+def swapcase(s: str) -> str:
+    raise DeprecationWarning()
+
+def translate(s: str, table: str, deletechars: str = ...) -> str:
+    raise DeprecationWarning()
+
+def upper(s: str) -> str:
+    raise DeprecationWarning()
+