aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2016-09-07 17:00:09 -0700
committerMark Sapiro <mark@msapiro.net>2016-09-07 17:00:09 -0700
commit2a85996a5aa441f4e0a9ceec48e2137508158595 (patch)
tree4e4986cf26890f2842b8e3bc99220cda3dfb698b
parent7643edc69ea4f4fc80c630c3dfb887658bd722b9 (diff)
downloadmailman2-2a85996a5aa441f4e0a9ceec48e2137508158595.tar.gz
mailman2-2a85996a5aa441f4e0a9ceec48e2137508158595.tar.xz
mailman2-2a85996a5aa441f4e0a9ceec48e2137508158595.zip
paths.py now adds dist-packages as well as site-packages to sys.path.
-rw-r--r--NEWS3
-rw-r--r--misc/paths.py.in7
2 files changed, 9 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 028c2730..e0eb1e0d 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,9 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - paths.py now adds dist-packages as well as site-packages to sys.path.
+ (LP: #1621172)
+
- INIT INFO has been added to the sample init.d script. (LP: #1620121)
2.1.23 (27-Aug-2016)
diff --git a/misc/paths.py.in b/misc/paths.py.in
index c5e56177..b4aae14e 100644
--- a/misc/paths.py.in
+++ b/misc/paths.py.in
@@ -1,6 +1,6 @@
# -*- python -*-
-# Copyright (C) 1998-2009 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2016 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -62,6 +62,11 @@ sitedir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
'site-packages')
sys.path.append(sitedir)
+# Include Python's dist-packages directory.
+distdir = os.path.join(sys.prefix, 'lib', 'python'+sys.version[:3],
+ 'dist-packages')
+sys.path.append(distdir)
+
# In a normal interactive Python environment, the japanese.pth and korean.pth
# files would be imported automatically. But because we inhibit the importing