Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/sugar
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@localhost.localdomain>2006-10-17 08:14:42 (GMT)
committer Marco Pesenti Gritti <marco@localhost.localdomain>2006-10-17 08:14:42 (GMT)
commit0836c57f76ad4c7c375c6d99ded0925d97c3d691 (patch)
treee3fb1f6f80c37491998d6ba092cabb74560e71ac /sugar
parent77f2de8f737d816391a9447e7b4e1ef77be92a6d (diff)
Get rid of the global python path extensions
Diffstat (limited to 'sugar')
-rw-r--r--sugar/__installed__.py.in2
-rw-r--r--sugar/__uninstalled__.py.in3
-rw-r--r--sugar/env.py10
3 files changed, 0 insertions, 15 deletions
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 3378d89..a8b28c9 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 4170d57..eeef329 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 8fe2a75..e70fcba 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']