1 files changed, 12 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
index 29e373c2ac..bdce83eebe 100644
--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
+++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/python/stub_template.txt
@@ -73,11 +73,18 @@ def Main():
                          sys.argv[0])
 
   python_imports = '%imports%'
-  python_path_entries = CreatePythonPathEntries(python_imports, module_space)
-
-  repo_dirs = [os.path.join(module_space, d) for d in os.listdir(module_space)]
-  repositories = [d for d in repo_dirs if os.path.isdir(d)]
-  python_path_entries += repositories
+  module_space_with_workspace_name = module_space
+  if '%workspace_name%' != '':
+    module_space_with_workspace_name = os.path.join(module_space, '%workspace_name%')
+
+  python_path_entries = CreatePythonPathEntries(
+    python_imports, module_space_with_workspace_name)
+
+  external_dir = os.path.join(module_space_with_workspace_name, 'external')
+  if os.path.isdir(external_dir):
+    external_entries = [os.path.join(external_dir, d) for d in os.listdir(external_dir)]
+    repositories = [d for d in external_entries if os.path.isdir(d)]
+    python_path_entries += repositories
 
   old_python_path = os.environ.get('PYTHONPATH')
   separator = ';' if IsWindows() else ':'