diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-19 12:15:27 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-19 12:15:27 -0400 |
| commit | b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687 (patch) | |
| tree | 691d7ab28da3b26944e82c9d7df32687c63c811d | |
| parent | dbc792498c1c8a3390c1babc1bf742def40e2b46 (diff) | |
| download | pyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.tar.gz pyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.tar.bz2 pyramid-b9b4657e79e7e1ed1f0c79bf82c3fe19a0ab5687.zip | |
- Undo effects of merging pull #661 because tests wont pass on windows
https://github.com/Pylons/pyramid/pull/661
| -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) |