From 85f02c744edd68e6c42a99545287f3b4eedce4bd Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 30 Aug 2014 09:41:47 +0530
Subject: [PATCH] Remove vendor directory infavor of python module dependencies

---
 .gitmodules        | 6 ------
 plinth/__main__.py | 9 ---------
 vendor/__init__.py | 0
 vendor/withsqlite  | 1 -
 4 files changed, 16 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 100644 vendor/__init__.py
 delete mode 160000 vendor/withsqlite

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 9622603f6..000000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "vendor/withsqlite"]
-	path = vendor/withsqlite
-	url = git://github.com/jvasile/withsqlite.git
-[submodule "vendor/exmachina"]
-	path = vendor/exmachina
-	url = git://github.com/jvasile/exmachina.git
diff --git a/plinth/__main__.py b/plinth/__main__.py
index 25a67d652..b418b2b26 100644
--- a/plinth/__main__.py
+++ b/plinth/__main__.py
@@ -64,13 +64,6 @@ def setup_logging():
         cherrypy.log.screen = False
 
 
-def setup_paths():
-    """Setup current directory and python import paths"""
-    os.chdir(cfg.python_root)
-    if not os.path.join(cfg.file_root, 'vendor') in sys.path:
-        sys.path.append(os.path.join(cfg.file_root, 'vendor'))
-
-
 def setup_server():
     """Setup CherryPy server"""
     LOGGER.info('Setting up CherryPy server')
@@ -224,8 +217,6 @@ def main():
 
     service.init()
 
-    setup_paths()
-
     configure_django()
 
     module_loader.load_modules()
diff --git a/vendor/__init__.py b/vendor/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/vendor/withsqlite b/vendor/withsqlite
deleted file mode 160000
index 3558eaf5e..000000000
--- a/vendor/withsqlite
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3558eaf5e997920da1994aa8f2b52086c0bfbfb4