Rearrange overloads to account for optional arguments (python#2150)

Basically, the same thing as [my previous pull request][0], except the
fixes are now focusing on functions with overlapping argument counts.

  [0]: python#2138

stdlib/2/os/path.pyi

@@ -140,9 +140,9 @@ else:
     def join(path: AnyStr, *paths: AnyStr) -> AnyStr: ...
 
 @overload
-def relpath(path: _StrPath, start: Optional[_StrPath] = ...) -> Text: ...  # type: ignore
+def relpath(path: _BytesPath, start: _BytesPath) -> bytes: ...  # type: ignore
 @overload
-def relpath(path: _BytesPath, start: _BytesPath) -> bytes: ...
+def relpath(path: _StrPath, start: Optional[_StrPath] = ...) -> Text: ...
 
 def samefile(path1: _PathType, path2: _PathType) -> bool: ...
 def sameopenfile(fp1: int, fp2: int) -> bool: ...

stdlib/2and3/sysconfig.pyi

@@ -5,7 +5,7 @@ from typing import overload, Any, Dict, IO, List, Optional, Tuple, Union
 @overload
 def get_config_vars() -> Dict[str, Any]: ...
 @overload
-def get_config_vars(*args: str) -> List[Any]: ...
+def get_config_vars(arg: str, *args: str) -> List[Any]: ...
 def get_config_var(name: str) -> Optional[str]: ...
 def get_scheme_names() -> Tuple[str, ...]: ...
 def get_path_names() -> Tuple[str, ...]: ...

stdlib/3/os/path.pyi

@@ -140,9 +140,9 @@ else:
     def join(path: AnyStr, *paths: AnyStr) -> AnyStr: ...
 
 @overload
-def relpath(path: _StrPath, start: Optional[_StrPath] = ...) -> Text: ...  # type: ignore
+def relpath(path: _BytesPath, start: _BytesPath) -> bytes: ...  # type: ignore
 @overload
-def relpath(path: _BytesPath, start: _BytesPath) -> bytes: ...
+def relpath(path: _StrPath, start: Optional[_StrPath] = ...) -> Text: ...
 
 def samefile(path1: _PathType, path2: _PathType) -> bool: ...
 def sameopenfile(fp1: int, fp2: int) -> bool: ...

third_party/3/pkg_resources.pyi

@@ -108,7 +108,7 @@ def get_entry_info(dist: _EPDistType, group: str,
 @overload
 def get_entry_map(dist: _EPDistType) -> Dict[str, Dict[str, EntryPoint]]: ...
 @overload
-def get_entry_map(dist: _EPDistType, group: str = ...) -> Dict[str, EntryPoint]: ...
+def get_entry_map(dist: _EPDistType, group: str) -> Dict[str, EntryPoint]: ...
 
 class EntryPoint:
     name = ...  # type: str
@@ -174,7 +174,7 @@ class Distribution(IResourceProvider, IMetadataProvider):
     def get_entry_map(dist: _EPDistType) \
                       -> Dict[str, Dict[str, EntryPoint]]: ...
     @overload
-    def get_entry_map(dist: _EPDistType, group: str = ...) \
+    def get_entry_map(dist: _EPDistType, group: str) \
                       -> Dict[str, EntryPoint]: ...
     def load_entry_point(dist: _EPDistType, group: str, name: str) -> None: ...