From 00c3d9feeb8e25136724823a4dd520bf33a37c3d Mon Sep 17 00:00:00 2001
From: Dmitry Trofimov <dmitry.trofimov@jetbrains.com>
Date: Sat, 6 Sep 2014 03:13:06 +0200
Subject: [PATCH] Move pluginbase back to restore plugin imports.

---
 python/helpers/pydev/{third_party => }/pkgutil_old.py | 0
 python/helpers/pydev/{third_party => }/pluginbase.py  | 2 +-
 python/helpers/pydev/pydevd_plugin_utils.py           | 2 +-
 python/helpers/pydev/{third_party => }/uuid_old.py    | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename python/helpers/pydev/{third_party => }/pkgutil_old.py (100%)
 rename python/helpers/pydev/{third_party => }/pluginbase.py (99%)
 rename python/helpers/pydev/{third_party => }/uuid_old.py (100%)

diff --git a/python/helpers/pydev/third_party/pkgutil_old.py b/python/helpers/pydev/pkgutil_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/pkgutil_old.py
rename to python/helpers/pydev/pkgutil_old.py
diff --git a/python/helpers/pydev/third_party/pluginbase.py b/python/helpers/pydev/pluginbase.py
similarity index 99%
rename from python/helpers/pydev/third_party/pluginbase.py
rename to python/helpers/pydev/pluginbase.py
index 0ad6404eee00..4051e92c1c2a 100644
--- a/python/helpers/pydev/third_party/pluginbase.py
+++ b/python/helpers/pydev/pluginbase.py
@@ -16,7 +16,7 @@ from pydevd_constants import IS_PY24, IS_PY3K
 
 
 if IS_PY24:
-    from third_party.uuid_old import uuid4
+    from uuid_old import uuid4
 else:
     from uuid import uuid4
 
diff --git a/python/helpers/pydev/pydevd_plugin_utils.py b/python/helpers/pydev/pydevd_plugin_utils.py
index 74b49c6346cc..07bc05d4b3a3 100644
--- a/python/helpers/pydev/pydevd_plugin_utils.py
+++ b/python/helpers/pydev/pydevd_plugin_utils.py
@@ -2,7 +2,7 @@ import os
 import types
 
 import pydev_log
-from third_party.pluginbase import PluginBase
+from pluginbase import PluginBase
 
 
 def load_plugins(package):
diff --git a/python/helpers/pydev/third_party/uuid_old.py b/python/helpers/pydev/uuid_old.py
similarity index 100%
rename from python/helpers/pydev/third_party/uuid_old.py
rename to python/helpers/pydev/uuid_old.py