mirror of
https://github.com/rembo10/headphones.git
synced 2026-07-20 16:03:59 +01:00
cherrypy: 18.8.0 -> 6387a2b
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
"""
|
||||
Configuration system for CherryPy.
|
||||
"""Configuration system for CherryPy.
|
||||
|
||||
Configuration in CherryPy is implemented via dictionaries. Keys are strings
|
||||
which name the mapped value, which may be of any type.
|
||||
@@ -132,8 +131,8 @@ def _if_filename_register_autoreload(ob):
|
||||
def merge(base, other):
|
||||
"""Merge one app config (from a dict, file, or filename) into another.
|
||||
|
||||
If the given config is a filename, it will be appended to
|
||||
the list of files to monitor for "autoreload" changes.
|
||||
If the given config is a filename, it will be appended to the list
|
||||
of files to monitor for "autoreload" changes.
|
||||
"""
|
||||
_if_filename_register_autoreload(other)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user