From 6280ff1ae93c68e64f47bad53f75ee9fc8244f48 Mon Sep 17 00:00:00 2001 From: Antti Haapala Date: Mon, 1 Jun 2020 03:58:25 +0300 Subject: Fixing #3592 - output diagnostic messages to stderr, not stdout --- src/pyramid/scripts/pserve.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py index ce0c454e6..ef0d1ceb5 100644 --- a/src/pyramid/scripts/pserve.py +++ b/src/pyramid/scripts/pserve.py @@ -143,7 +143,7 @@ class PServeCommand: def out(self, msg): # pragma: no cover if self.args.verbose > 0: - print(msg) + print(msg, file=sys.stderr) def get_config_path(self, loader): return os.path.abspath(loader.uri.path) @@ -296,7 +296,10 @@ def wsgiref_server_runner(wsgi_app, global_conf, **kw): # pragma: no cover host = kw.get('host', '0.0.0.0') port = int(kw.get('port', 8080)) server = make_server(host, port, wsgi_app) - print('Starting HTTP server on http://%s:%s' % (host, port)) + print( + 'Starting HTTP server on http://%s:%s' % (host, port), + file=sys.stderr + ) server.serve_forever() @@ -416,10 +419,14 @@ def cherrypy_server_runner( if host == '0.0.0.0': print( 'serving on 0.0.0.0:%s view at %s://127.0.0.1:%s' - % (port, protocol, port) + % (port, protocol, port), + file=sys.stderr ) else: - print('serving on %s://%s:%s' % (protocol, host, port)) + print( + 'serving on %s://%s:%s' % (protocol, host, port), + file=sys.stderr + ) server.start() except (KeyboardInterrupt, SystemExit): server.stop() -- cgit v1.2.3 From ddbc27715d991629bd071857096f863c27ea28d0 Mon Sep 17 00:00:00 2001 From: Antti Haapala Date: Tue, 2 Jun 2020 14:27:44 +0300 Subject: fix lint for previous change. --- src/pyramid/scripts/pserve.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pyramid/scripts/pserve.py b/src/pyramid/scripts/pserve.py index ef0d1ceb5..6906a0410 100644 --- a/src/pyramid/scripts/pserve.py +++ b/src/pyramid/scripts/pserve.py @@ -297,8 +297,7 @@ def wsgiref_server_runner(wsgi_app, global_conf, **kw): # pragma: no cover port = int(kw.get('port', 8080)) server = make_server(host, port, wsgi_app) print( - 'Starting HTTP server on http://%s:%s' % (host, port), - file=sys.stderr + 'Starting HTTP server on http://%s:%s' % (host, port), file=sys.stderr ) server.serve_forever() @@ -420,12 +419,12 @@ def cherrypy_server_runner( print( 'serving on 0.0.0.0:%s view at %s://127.0.0.1:%s' % (port, protocol, port), - file=sys.stderr + file=sys.stderr, ) else: print( 'serving on %s://%s:%s' % (protocol, host, port), - file=sys.stderr + file=sys.stderr, ) server.start() except (KeyboardInterrupt, SystemExit): -- cgit v1.2.3