Revision: 8084
http://svn.sourceforge.net/mailman/?rev=8084&view=rev
Author: bwarsaw
Date: 2006-11-01 21:43:06 -0800 (Wed, 01 Nov 2006)
Log Message:
-----------
Fix use of easy_install.py flags. This ensures that wsgiref gets installed in
our pythonlib directory, not the system's python's site-packages. However,
ensure that any eggs in the site-packages or pythonlib directories gets
properly added to sys.path.
Add pysqlite-2.3.2 and SQLAlchemy-0.3.0, though they aren't yet used.
Modified Paths:
--------------
trunk/mailman/misc/Makefile.in
trunk/mailman/misc/paths.py.in
Added Paths:
-----------
trunk/mailman/misc/SQLAlchemy-0.3.0.tar.gz
trunk/mailman/misc/pysqlite-2.3.2.tar.gz
Modified: trunk/mailman/misc/Makefile.in
===================================================================
--- trunk/mailman/misc/Makefile.in 2006-10-30 02:56:10 UTC (rev 8083)
+++ trunk/mailman/misc/Makefile.in 2006-11-02 05:43:06 UTC (rev 8084)
@@ -57,11 +57,13 @@
EMAIL= email-4.0.1
SETUPTOOLS= setuptools-0.6c3
-SETUPPKGS= $(EMAIL) $(SETUPTOOLS)
+PYSQLITE= pysqlite-2.3.2
+SQLALCHEMY= SQLAlchemy-0.3.0
+SETUPPKGS= $(EMAIL) $(SETUPTOOLS) $(PYSQLITE) $(SQLALCHEMY)
EZINSTOPTS= --install-dir $(DESTDIR)$(PYTHONLIBDIR)
EZCMD= $(PYTHONLIBDIR)/$(SETUPTOOLS)-py2.4.egg/easy_install.py \
- $(EZINSTALLOPTS)
+ $(EZINSTOPTS)
WSGIREF= wsgiref-0.1.2-py2.4.egg
EZPKGS= $(WSGIREF)
Added: trunk/mailman/misc/SQLAlchemy-0.3.0.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/mailman/misc/SQLAlchemy-0.3.0.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/mailman/misc/paths.py.in
===================================================================
--- trunk/mailman/misc/paths.py.in 2006-10-30 02:56:10 UTC (rev 8083)
+++ trunk/mailman/misc/paths.py.in 2006-11-02 05:43:06 UTC (rev 8084)
@@ -24,8 +24,9 @@
# attributes that other modules may use to get the absolute path to the
# installed Mailman distribution.
+import os
import sys
-import os
+import site
# some scripts expect this attribute to be in this module
prefix = '@prefix@'
@@ -39,16 +40,21 @@
# directory.
sys.path.insert(0, prefix)
-# We also need the pythonlib directory on the path to pick up any overrides of
-# standard modules and packages. Note that these must go at the front of the
-# path for this reason.
-sys.path.insert(0, os.path.join(prefix, 'pythonlib'))
+# Add Python's site-packages for system add-ons. Then add our pythonlib
+# directory on path to pick up any overrides of the standard modules and
+# packages. In both cases, process any .pth files found in either location.
+# Order here matters: our pythonlib directory goes at the front while the
+# system site-packages goes at the end.
+sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
+ 'site-packages')
+pythonlib = os.path.join(prefix, 'pythonlib')
-# Include Python's site-packages directory.
-sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
- 'site-packages')
+sys.path.insert(0, pythonlib)
sys.path.append(sitedir)
+site.addsitedir(pythonlib)
+site.addsitedir(sitedir)
+
# Arabic and Hebrew (RFC-1556) encoding aliases. (temporary solution)
import encodings.aliases
encodings.aliases.aliases.update({
Added: trunk/mailman/misc/pysqlite-2.3.2.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/mailman/misc/pysqlite-2.3.2.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
