Vasanko/sanic
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Raphael Deem 2017-03-26 15:49:58 -07:00
commit aebd717039
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sanic/app.py
View File

@ -597,17 +597,23 @@ class Sanic:
NOTE: This does not support multiprocessing and is not the preferred NOTE: This does not support multiprocessing and is not the preferred
way to run a Sanic application. way to run a Sanic application.
""" """
<<<<<<< HEAD
<<<<<<< df9884de3c7ca6ad248162c8f404afd0ed774359 <<<<<<< df9884de3c7ca6ad248162c8f404afd0ed774359
if protocol is None: if protocol is None:
protocol = (WebSocketProtocol if self.websocket_enabled protocol = (WebSocketProtocol if self.websocket_enabled
else HttpProtocol) else HttpProtocol)
======= =======
=======
>>>>>>> 2dca53a696064d5f3447484febb2294648b37d1f
if stop_event is not None: if stop_event is not None:
if debug: if debug:
warnings.simplefilter('default') warnings.simplefilter('default')
warnings.warn("stop_event will be removed from future versions.", warnings.warn("stop_event will be removed from future versions.",
DeprecationWarning) DeprecationWarning)
<<<<<<< HEAD
>>>>>>> remove stop_event >>>>>>> remove stop_event
=======
>>>>>>> 2dca53a696064d5f3447484febb2294648b37d1f
server_settings = self._helper( server_settings = self._helper(
host=host, port=port, debug=debug, before_start=before_start, host=host, port=port, debug=debug, before_start=before_start,
after_start=after_start, before_stop=before_stop, after_start=after_start, before_stop=before_stop,
@ -623,6 +629,7 @@ class Sanic:
protocol=HttpProtocol, backlog=100, stop_event=None, protocol=HttpProtocol, backlog=100, stop_event=None,
register_sys_signals=True, run_async=False): register_sys_signals=True, run_async=False):
"""Helper function used by `run` and `create_server`.""" """Helper function used by `run` and `create_server`."""
<<<<<<< HEAD
<<<<<<< df9884de3c7ca6ad248162c8f404afd0ed774359 <<<<<<< df9884de3c7ca6ad248162c8f404afd0ed774359
if isinstance(ssl, dict): if isinstance(ssl, dict):
@ -636,12 +643,17 @@ class Sanic:
ssl = context ssl = context
======= =======
=======
>>>>>>> 2dca53a696064d5f3447484febb2294648b37d1f
if stop_event is not None: if stop_event is not None:
if debug: if debug:
warnings.simplefilter('default') warnings.simplefilter('default')
warnings.warn("stop_event will be removed from future versions.", warnings.warn("stop_event will be removed from future versions.",
DeprecationWarning) DeprecationWarning)
<<<<<<< HEAD
>>>>>>> remove stop_event >>>>>>> remove stop_event
=======
>>>>>>> 2dca53a696064d5f3447484febb2294648b37d1f
if loop is not None: if loop is not None:
if debug: if debug:
warnings.simplefilter('default') warnings.simplefilter('default')