mod-wsgi 6.0.3.dev1__tar.gz → 6.0.4__tar.gz

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.3.dev1
+Version: 6.0.4
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.4}/mod_wsgi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mod_wsgi
-Version: 6.0.3.dev1
+Version: 6.0.4
 Summary: Installer for Apache/mod_wsgi.
 Home-page: https://www.modwsgi.org/
 Author: Graham Dumpleton

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.4}/src/express/management/commands/runmodwsgi.py

@@ -7,9 +7,12 @@ import subprocess
 from django.core.management.base import BaseCommand, CommandError
 
 import mod_wsgi.express
+import mod_wsgi.express.options
+import mod_wsgi.express.server
 
 def check_percentage(string):
-    if value is not None and value < 0 or value > 1:
+    value = float(string)
+    if value < 0 or value > 1:
         import argparse
         msg = '%s option value needs to be within the range 0 to 1.' % string
         raise argparse.ArgumentTypeError(msg)
@@ -48,6 +51,20 @@ class Command(BaseCommand):
                         elif attr == 'default':
                             if getattr(option, attr) != ('NO', 'DEFAULT'):
                                 kwargs[attr] = getattr(option, attr)
+                        elif attr == 'help':
+                            # optparse displays help text literally, but
+                            # argparse expands it with '%'-formatting. Escape
+                            # any literal '%' (e.g. the '%{GLOBAL}' token) and
+                            # translate the optparse '%default'/'%prog' tokens
+                            # to their argparse equivalents.
+                            help_text = getattr(option, attr)
+                            if help_text is not None:
+                                help_text = help_text.replace('%', '%%')
+                                help_text = help_text.replace(
+                                        '%%default', '%(default)s')
+                                help_text = help_text.replace(
+                                        '%%prog', '%(prog)s')
+                                kwargs[attr] = help_text
                         else:
                             if getattr(option, attr) is not None:
                                 kwargs[attr] = getattr(option, attr)

{mod_wsgi-6.0.3.dev1 → mod_wsgi-6.0.4}/src/server/wsgi_version.h

@@ -25,8 +25,8 @@
 
 #define MOD_WSGI_MAJORVERSION_NUMBER 6
 #define MOD_WSGI_MINORVERSION_NUMBER 0
-#define MOD_WSGI_MICROVERSION_NUMBER 3
-#define MOD_WSGI_VERSION_STRING "6.0.3.dev1"
+#define MOD_WSGI_MICROVERSION_NUMBER 4
+#define MOD_WSGI_VERSION_STRING "6.0.4"
 
 /* ------------------------------------------------------------------------- */