From 0836c57f76ad4c7c375c6d99ded0925d97c3d691 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Tue, 17 Oct 2006 10:14:42 +0200
Subject: [PATCH] Get rid of the global python path extensions

---
 sugar-emulator              |  4 +---
 sugar/__installed__.py.in   |  2 --
 sugar/__uninstalled__.py.in |  3 ---
 sugar/env.py                | 10 ----------
 4 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/sugar-emulator b/sugar-emulator
index 4973e083..b59d2588 100755
--- a/sugar-emulator
+++ b/sugar-emulator
@@ -19,9 +19,7 @@
 import os
 import sys
 
-curdir = os.path.abspath(os.path.dirname(__file__))
-sourcedir = os.path.dirname(curdir)
-
+sourcedir = os.path.abspath(os.path.dirname(__file__))
 if os.path.isfile(os.path.join(sourcedir, 'sugar/__uninstalled__.py')):
 	print 'Running sugar from ' + sourcedir + ' ...'
 	sys.path.insert(0, sourcedir)
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 3378d896..a8b28c93 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -5,6 +5,4 @@ sugar_activity_info_dir = '@prefix@/share/sugar/activities'
 sugar_services_dir = '@prefix@/share/sugar/services'
 sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
 
-sugar_python_path = ['@prefix@/share/sugar/activities']
-
 sugar_bin_path = []
diff --git a/sugar/__uninstalled__.py.in b/sugar/__uninstalled__.py.in
index 4170d57d..eeef3297 100644
--- a/sugar/__uninstalled__.py.in
+++ b/sugar/__uninstalled__.py.in
@@ -10,9 +10,6 @@ sugar_activity_info_dir = __tmpdir
 
 sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf')
 
-sugar_python_path = []
-sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
-
 sugar_bin_path = []
 sugar_bin_path.append(os.path.join(sugar_source_dir))
 sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
diff --git a/sugar/env.py b/sugar/env.py
index 8fe2a758..e70fcba3 100644
--- a/sugar/env.py
+++ b/sugar/env.py
@@ -26,17 +26,7 @@ except ImportError:
 
 import sugar.setup
 
-def setup_python_path():
-	for path in sugar_python_path:
-		if os.environ.has_key('PYTHONPATH'):
-			old_path = os.environ['PYTHONPATH']
-			os.environ['PYTHONPATH'] = path + ':' + old_path 
-		else:
-			os.environ['PYTHONPATH'] = path
-
 def setup_system():
-	setup_python_path()
-
 	for path in sugar_bin_path:
 		if os.environ.has_key('PATH'):
 			old_path = os.environ['PATH']