diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-08-28 17:33:44 -0700 |
| commit | 72d296a7f3b931e426b53f7725ab05b09dc1ea4b (patch) | |
| tree | cef44e834e13da97f12f25dbcda8c25cd4df6258 /synapse/config/__init__.py | |
| parent | Cross-signing [1/4] -- hidden devices (#5759) (diff) | |
| parent | Add a link to python's logging config schema (#5926) (diff) | |
| download | synapse-72d296a7f3b931e426b53f7725ab05b09dc1ea4b.tar.xz | |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
Diffstat (limited to 'synapse/config/__init__.py')
| -rw-r--r-- | synapse/config/__init__.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/config/__init__.py b/synapse/config/__init__.py index f2a5a41e92..1e76e9559d 100644 --- a/synapse/config/__init__.py +++ b/synapse/config/__init__.py @@ -13,8 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -from ._base import ConfigError +from ._base import ConfigError, find_config_files -# export ConfigError if somebody does import * +# export ConfigError and find_config_files if somebody does +# import * # this is largely a fudge to stop PEP8 moaning about the import -__all__ = ["ConfigError"] +__all__ = ["ConfigError", "find_config_files"] |