[Pywikibot-commits] [Gerrit] pywikibot/core[master]: Fix W504 in family.py and site_detect.py

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/473703 ) Change subject: Fix W504 in family.py and site_detect.py ...................................................................... Fix W504 in family.py and site_detect.py Fixed the W504 occurences in the 2 mentioned files. Bug: T207836 Change-Id: Id799ba529dcfa43a4d4dd849bd92b349d66acd2c --- M pywikibot/family.py M pywikibot/site_detect.py 2 files changed, 21 insertions(+), 21 deletions(-) Approvals: D3r1ck01: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index 28b032c..6802abb 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1602,23 +1602,23 @@ ] content_families = set( - multi_language_content_families + - wikimedia_org_content_families + - other_content_families + multi_language_content_families + + wikimedia_org_content_families + + other_content_families ) wikimedia_org_families = set( - wikimedia_org_content_families + - wikimedia_org_meta_families + - wikimedia_org_other_families + wikimedia_org_content_families + + wikimedia_org_meta_families + + wikimedia_org_other_families ) # CentralAuth cross avaliable projects. cross_projects = set( - multi_language_content_families + - wikimedia_org_content_families + - wikimedia_org_meta_families + - other_content_families + multi_language_content_families + + wikimedia_org_content_families + + wikimedia_org_meta_families + + other_content_families ) # Code mappings which are only an alias, and there is no 'old' wiki. diff --git a/pywikibot/site_detect.py b/pywikibot/site_detect.py index 42c7370..c8d6f13 100644 --- a/pywikibot/site_detect.py +++ b/pywikibot/site_detect.py @@ -105,8 +105,8 @@ raise RuntimeError('Unable to determine articlepath: ' '{0}'.format(self.fromurl)) - if (not self.version or - self.version < MediaWikiVersion('1.14')): + if (not self.version + or self.version < MediaWikiVersion('1.14')): raise RuntimeError('Unsupported version: {0}'.format(self.version)) def __repr__(self): @@ -117,9 +117,9 @@ def langs(self): """Build interwikimap.""" response = fetch( - self.api + - '?action=query&meta=siteinfo&siprop=interwikimap&sifilteriw=local' - '&format=json') + self.api + + '?action=query&meta=siteinfo&siprop=interwikimap' + '&sifilteriw=local&format=json') iw = json.loads(response.text) if 'error' in iw: raise RuntimeError('%s - %s' % (iw['error']['code'], @@ -171,8 +171,8 @@ # remove preleading newlines and Byte Order Mark (BOM), see T128992 content = response.text.strip().lstrip('\uFEFF') info = json.loads(content) - self.private_wiki = ('error' in info and - info['error']['code'] == 'readapidenied') + self.private_wiki = ('error' in info + and info['error']['code'] == 'readapidenied') if self.private_wiki: # user-config.py is not loaded because PYWIKIBOT_NO_USER_CONFIG # is set to '2' by generate_family_file.py. @@ -202,8 +202,8 @@ def __eq__(self, other): """Return True if equal to other.""" - return (self.server + self.scriptpath == - other.server + other.scriptpath) + return (self.server + self.scriptpath + == other.server + other.scriptpath) def __hash__(self): """Get hashable representation.""" @@ -285,8 +285,8 @@ return # allow http://www.brickwiki.info/ vs http://brickwiki.info/ - if (new_parsed_url.netloc in self._parsed_url.netloc or - self._parsed_url.netloc in new_parsed_url.netloc): + if (new_parsed_url.netloc in self._parsed_url.netloc + or self._parsed_url.netloc in new_parsed_url.netloc): return assert new_parsed_url == self._parsed_url, '{0} != {1}'.format( -- To view, visit https://gerrit.wikimedia.org/r/473703 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Id799ba529dcfa43a4d4dd849bd92b349d66acd2c Gerrit-Change-Number: 473703 Gerrit-PatchSet: 3 Gerrit-Owner: Nathan fraignt &lt;nathanklumpenaar10(a)outlook.com&gt; Gerrit-Reviewer: D3r1ck01 &lt;alangiderick(a)gmail.com&gt; Gerrit-Reviewer: Dvorapa &lt;dvorapa(a)seznam.cz&gt; Gerrit-Reviewer: Framawiki &lt;framawiki(a)tools.wmflabs.org&gt; Gerrit-Reviewer: Nathan fraignt &lt;nathanklumpenaar10(a)outlook.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot (75)