diff options
| author | Alexis Metaireau <alexis@notmyidea.org> | 2016-04-05 00:56:14 +0200 |
|---|---|---|
| committer | Alexis Metaireau <alexis@notmyidea.org> | 2016-04-05 00:56:14 +0200 |
| commit | 698efd7681d3d9fa6f621046a4dc95e0edc36a55 (patch) | |
| tree | 724d03e09ff6aa189dc6e67ca9be505b5fcfaea5 /budget/merged_settings.py | |
| parent | a8841f9d3f90ec4c1915493a1b34fa1798895772 (diff) | |
| parent | b685fa74d641ceeb077005698cc63108350f1d36 (diff) | |
| download | ihatemoney-mirror-698efd7681d3d9fa6f621046a4dc95e0edc36a55.zip ihatemoney-mirror-698efd7681d3d9fa6f621046a4dc95e0edc36a55.tar.gz ihatemoney-mirror-698efd7681d3d9fa6f621046a4dc95e0edc36a55.tar.bz2 | |
Merge pull request #129 from JocelynDelalande/no-user-settings-in-tests
Do not load user-overriden settings in unit tests.
Diffstat (limited to 'budget/merged_settings.py')
| -rw-r--r-- | budget/merged_settings.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/budget/merged_settings.py b/budget/merged_settings.py new file mode 100644 index 0000000..f6b1f81 --- /dev/null +++ b/budget/merged_settings.py @@ -0,0 +1,10 @@ +""" +Merges default settings with user-defined settings +""" + +from default_settings import * + +try: + from settings import * +except ImportError: + pass |