Add the --python-path option to mod_wsgi-express to allow Python module search path directories to be specified to mod_wsgi-express as command line options.

Author: GrahamDumpleton

docs/release-notes/version-4.3.3.rst

@@ -267,3 +267,11 @@ then coverage analysis is enabled. When the server is exited, then the
 profiler data will be output to the ``pstats.dat`` file under the server
 working directory, or the file specified using the ``profiler-output-file``
 option.
+
+12. Added the ``--python-path`` option to ``mod_wsgi-express`` to specify
+additional directories that should be added to the Python module search path.
+
+Note that these directories will not be processed for ``.pth`` files. If
+processing of ``.pth`` files is required, then the ``PYTHONPATH`` environment
+variable should be set and exported in a script file referred to using the
+``--envvars-script`` option.

src/server/__init__.py

@@ -1028,6 +1028,8 @@ def __call__(self, environ, start_response):
 import mod_wsgi.server
 
 working_directory = '%(working_directory)s'
+python_paths = %(python_paths)s
+
 entry_point = '%(entry_point)s'
 application_type = '%(application_type)s'
 callable_object = '%(callable_object)s'
@@ -1044,6 +1046,9 @@ def __call__(self, environ, start_response):
 enable_profiler = %(enable_profiler)s
 profiler_output_file = '%(profiler_output_file)s'
 
+if python_paths:
+    sys.path.extend(python_paths)
+
 if debug_mode:
     # We need to fiddle sys.path as we are not using daemon mode and so
     # the working directory will not be added to sys.path by virtue of
@@ -1689,6 +1694,14 @@ def check_percentage(option, opt_str, value, parser):
             default=apxs_config.ROTATELOGS, metavar='FILE-PATH',
             help='Override the path to the rotatelogs executable.'),
 
+    optparse.make_option('--python-path', action='append',
+            dest='python_paths', metavar='DIRECTORY-PATH', help='Specify '
+            'the path to any additional directory that should be added to '
+            'the Python module search path. Note that these directories will '
+            'not be processed for \'.pth\' files. If processing of \'.pth\' '
+            'files is required, set the \'PYTHONPATH\' environment variable '
+            'in a script specified by the \'--envvars-script\' option.'),
+
     optparse.make_option('--python-eggs', metavar='DIRECTORY-PATH',
             help='Specify an alternate directory which should be used for '
             'unpacking of Python eggs. Defaults to a sub directory of '