diff options
| author | Michael Merickel <michael@merickel.org> | 2016-01-26 16:58:56 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2016-01-26 16:58:56 -0600 |
| commit | 80659b288fb223884f26f75a4f1786305e86d4b6 (patch) | |
| tree | d1e9d016597179661cfa5fb2ad10fe88a8a33a59 | |
| parent | 6f259290241fbe3758f3e7a37f5853b16d7d5971 (diff) | |
| parent | 26adba13bb999b73398727925fe0ace7c947f59d (diff) | |
| download | pyramid-80659b288fb223884f26f75a4f1786305e86d4b6.tar.gz pyramid-80659b288fb223884f26f75a4f1786305e86d4b6.tar.bz2 pyramid-80659b288fb223884f26f75a4f1786305e86d4b6.zip | |
Merge pull request #2292 from marc1n/master
Fixed --browser behaviour when --server-name provided
| -rw-r--r-- | CONTRIBUTORS.txt | 2 | ||||
| -rw-r--r-- | pyramid/scripts/pserve.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 1f3597e84..7c895ac15 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -258,3 +258,5 @@ Contributors - Rami Chousein, 2015/10/28 - Sri Sanketh Uppalapati, 2015/12/12 + +- Marcin Raczyński, 2016/01/26 diff --git a/pyramid/scripts/pserve.py b/pyramid/scripts/pserve.py index 155b82bdc..3ea614eb5 100644 --- a/pyramid/scripts/pserve.py +++ b/pyramid/scripts/pserve.py @@ -391,7 +391,7 @@ a real process manager for your processes like Systemd, Circus, or Supervisor. if self.options.browser: def open_browser(): - context = loadcontext(SERVER, app_spec, name=app_name, relative_to=base, + context = loadcontext(SERVER, app_spec, name=server_name, relative_to=base, global_conf=vars) url = 'http://127.0.0.1:{port}/'.format(**context.config()) time.sleep(1) |