diff options
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 13 |
2 files changed, 6 insertions, 10 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index abd30c950..0291d924a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -23,9 +23,6 @@ Bug Fixes https://github.com/Pylons/pyramid/issues/606 https://github.com/Pylons/pyramid/issues/607 -- ``pserve``: don't show --stop-daemon option on Windows. - https://github.com/Pylons/pyramid/pull/661 - Features -------- diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 151aa34b6..ea2a4ae09 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -136,13 +136,12 @@ class PServeCommand(object): metavar="GROUP", help="Set the group (usually only possible when run as root)") - if hasattr(os, 'fork'): - parser.add_option( - '--stop-daemon', - dest='stop_daemon', - action='store_true', - help=('Stop a daemonized server (given a PID file, or default ' - 'pyramid.pid file)')) + parser.add_option( + '--stop-daemon', + dest='stop_daemon', + action='store_true', + help=('Stop a daemonized server (given a PID file, or default ' + 'pyramid.pid file)')) _scheme_re = re.compile(r'^[a-z][a-z]+:', re.I) |