From: Joe Guo Date: Mon, 30 Jul 2018 06:22:02 +0000 (+1200) Subject: PEP8: fix E701: multiple statements on one line (colon) X-Git-Tag: tdb-1.3.17~2051 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d23170c961194234ef6131482233405cdd55a349;p=thirdparty%2Fsamba.git PEP8: fix E701: multiple statements on one line (colon) Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall --- diff --git a/python/samba/subunit/__init__.py b/python/samba/subunit/__init__.py index c6203c30afb..ca5511f899e 100644 --- a/python/samba/subunit/__init__.py +++ b/python/samba/subunit/__init__.py @@ -79,7 +79,8 @@ class RemotedTestCase(unittest.TestCase): (self._strclass(), self.__description) def run(self, result=None): - if result is None: result = self.defaultTestResult() + if result is None: + result = self.defaultTestResult() result.startTest(self) result.addError(self, RemoteError("Cannot run RemotedTestCases.\n")) result.stopTest(self) diff --git a/python/samba/tests/__init__.py b/python/samba/tests/__init__.py index 74658e81fd3..b3fccee8383 100644 --- a/python/samba/tests/__init__.py +++ b/python/samba/tests/__init__.py @@ -194,7 +194,8 @@ class TestCase(unittest.TestCase): result.addSuccess(self) def run(self, result=None): - if result is None: result = self.defaultTestResult() + if result is None: + result = self.defaultTestResult() result.startTest(self) testMethod = getattr(self, self._testMethodName) try: @@ -235,7 +236,8 @@ class TestCase(unittest.TestCase): for (fn, args, kwargs) in reversed(getattr(self, "_cleanups", [])): fn(*args, **kwargs) - if ok: result.addSuccess(self) + if ok: + result.addSuccess(self) finally: result.stopTest(self) diff --git a/source4/lib/wmi/wmi.py b/source4/lib/wmi/wmi.py index f227e399e16..fb86ba21154 100644 --- a/source4/lib/wmi/wmi.py +++ b/source4/lib/wmi/wmi.py @@ -13,13 +13,15 @@ except NameError: def _swig_setattr_nondynamic(self, class_type, name, value, static=1): - if (name == "thisown"): return self.this.own(value) + if (name == "thisown"): + return self.this.own(value) if (name == "this"): if type(value).__name__ == 'PySwigObject': self.__dict__[name] = value return method = class_type.__swig_setmethods__.get(name, None) - if method: return method(self, value) + if method: + return method(self, value) if (not static) or hasattr(self, name): self.__dict__[name] = value else: @@ -31,15 +33,19 @@ def _swig_setattr(self, class_type, name, value): def _swig_getattr(self, class_type, name): - if (name == "thisown"): return self.this.own() + if (name == "thisown"): + return self.this.own() method = class_type.__swig_getmethods__.get(name, None) - if method: return method(self) + if method: + return method(self) raise AttributeError(name) def _swig_repr(self): - try: strthis = "proxy of " + self.this.__repr__() - except: strthis = "" + try: + strthis = "proxy of " + self.this.__repr__() + except: + strthis = "" return "<%s.%s; %s >" % (self.__class__.__module__, self.__class__.__name__, strthis,) @@ -48,14 +54,16 @@ try: _object = types.ObjectType _newclass = 1 except AttributeError: - class _object: pass + class _object: + pass _newclass = 0 del types def _swig_setattr_nondynamic_method(set): def set_attr(self, name, value): - if (name == "thisown"): return self.this.own(value) + if (name == "thisown"): + return self.this.own(value) if hasattr(self, name) or (name == "this"): set(self, name, value) else: