From 43d37b875fc6d218d215748a0ed62491366d85fe Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Sat, 12 Mar 2016 18:29:27 +0500 Subject: [PATCH 1/2] FIX: unittestcompat now support tests without python-doc. That was an ugly bug... --- lib/unittestcompat.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/unittestcompat.py b/lib/unittestcompat.py index 12a497be9..1fe45a2a9 100644 --- a/lib/unittestcompat.py +++ b/lib/unittestcompat.py @@ -107,7 +107,8 @@ def method_for_parameter(self, method=method, parameter=parameter): name_for_parameter = method.__name__ + "(" + args_for_parameter + ")" frame = sys._getframe(1) # pylint: disable-msg=W0212 frame.f_locals[name_for_parameter] = method_for_parameter - frame.f_locals[name_for_parameter].__doc__ = method.__doc__ + '(' + args_for_parameter + ')' + if method.__doc__: + frame.f_locals[name_for_parameter].__doc__ = method.__doc__ + '(' + args_for_parameter + ')' method_for_parameter.__name__ = name_for_parameter + '(' + args_for_parameter + ')' return None return decorator From 826c6b10367667bffd63f5a83ffabfd0c6b0acfb Mon Sep 17 00:00:00 2001 From: maxkoryukov Date: Sun, 20 Mar 2016 17:10:29 +0500 Subject: [PATCH 2/2] full name for headphones.exceptions.SofChrootError --- headphones/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/headphones/__init__.py b/headphones/__init__.py index 4b36acf7a..daf067a56 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -143,7 +143,7 @@ def initialize(config_file): SOFT_CHROOT = SoftChroot(str(CONFIG.SOFT_CHROOT)) if SOFT_CHROOT.isEnabled(): logger.info("Soft-chroot enabled for dir: %s", str(CONFIG.SOFT_CHROOT)) - except exceptions.SoftChrootError as e: + except headphones.exceptions.SoftChrootError as e: logger.error("SoftChroot error: %s", e) raise e