diff options
Diffstat (limited to 'meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch')
-rw-r--r-- | meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch index 981694f0e8..06ab1f05e2 100644 --- a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch +++ b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch | |||
@@ -1,22 +1,23 @@ | |||
1 | From ff1dffd5673bcd2cbd9554ad62476d108dbc18af Mon Sep 17 00:00:00 2001 | 1 | From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001 |
2 | From: Simon Busch <simon.busch@lge.com> | 2 | From: Simon Busch <simon.busch@lge.com> |
3 | Date: Wed, 9 Apr 2014 13:20:33 +0200 | 3 | Date: Wed, 9 Apr 2014 13:20:33 +0200 |
4 | Subject: [PATCH 2/2] Add possibility to import templates from packages | 4 | Subject: [PATCH] Add possibility to import templates from packages |
5 | 5 | ||
6 | Does not have any unit tests yet. | 6 | Does not have any unit tests yet. |
7 | 7 | ||
8 | Signed-off-by: Simon Busch <simon.busch@lge.com> | 8 | Signed-off-by: Simon Busch <simon.busch@lge.com> |
9 | |||
9 | --- | 10 | --- |
10 | dbusmock/mockobject.py | 3 +++ | 11 | dbusmock/mockobject.py | 3 +++ |
11 | 1 file changed, 3 insertions(+) | 12 | 1 file changed, 3 insertions(+) |
12 | 13 | ||
13 | diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py | 14 | diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py |
14 | index a98e03d..9530c2a 100644 | 15 | index e4f130f..389df70 100644 |
15 | --- a/dbusmock/mockobject.py | 16 | --- a/dbusmock/mockobject.py |
16 | +++ b/dbusmock/mockobject.py | 17 | +++ b/dbusmock/mockobject.py |
17 | @@ -49,6 +49,9 @@ def load_module(name): | 18 | @@ -46,6 +46,9 @@ def load_module(name): |
18 | 19 | exec(f.read(), mod.__dict__, mod.__dict__) | |
19 | return module | 20 | return mod |
20 | 21 | ||
21 | + if '.' in name: | 22 | + if '.' in name: |
22 | + return importlib.import_module(name) | 23 | + return importlib.import_module(name) |
@@ -24,6 +25,3 @@ index a98e03d..9530c2a 100644 | |||
24 | return importlib.import_module('dbusmock.templates.' + name) | 25 | return importlib.import_module('dbusmock.templates.' + name) |
25 | 26 | ||
26 | 27 | ||
27 | -- | ||
28 | 1.7.9.5 | ||
29 | |||