From 94d3ddb60a87310de443f7b5655c35bee0f9dfe0 Mon Sep 17 00:00:00 2001
From: Matthias Kramm <kramm@quiss.org>
Date: Mon, 17 Oct 2016 17:49:12 -0700
Subject: [PATCH] change the way 'os' imports 'os.path' (#601)

* use 'from . import path' instead, in both PY2 and PY3
* update blacklist to include os/__init__.pyi
---
 stdlib/2.7/os/__init__.pyi | 2 +-
 stdlib/3/os/__init__.pyi   | 2 +-
 tests/pytype_blacklist.txt | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/stdlib/2.7/os/__init__.pyi b/stdlib/2.7/os/__init__.pyi
index ce6e6b351..8b81870bf 100644
--- a/stdlib/2.7/os/__init__.pyi
+++ b/stdlib/2.7/os/__init__.pyi
@@ -4,7 +4,7 @@ from typing import (
     List, Tuple, Union, Sequence, Mapping, IO, Any, Optional, AnyStr, Iterator,
     MutableMapping, NamedTuple, overload
 )
-from os import path
+from . import path
 
 error = OSError
 name = ... # type: str
diff --git a/stdlib/3/os/__init__.pyi b/stdlib/3/os/__init__.pyi
index e7818420f..01ced81d0 100644
--- a/stdlib/3/os/__init__.pyi
+++ b/stdlib/3/os/__init__.pyi
@@ -9,7 +9,7 @@ from typing import (
 )
 import sys
 from builtins import OSError as error
-import os.path as path
+from . import path
 
 # ----- os variables -----
 
diff --git a/tests/pytype_blacklist.txt b/tests/pytype_blacklist.txt
index d60aef402..2266bc05e 100644
--- a/tests/pytype_blacklist.txt
+++ b/tests/pytype_blacklist.txt
@@ -5,3 +5,7 @@ stdlib/2.7/builtins.pyi
 stdlib/2.7/types.pyi
 stdlib/2.7/typing.pyi
 stdlib/2and3/webbrowser.pyi
+
+# Because of 'from . import path':
+stdlib/2.7/os/__init__.pyi
+stdlib/3/os/__init__.pyi