From a4bc0607fce550cee256c54aaadf0e18d10502b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Michael=20O=2E=20Hegg=C3=B8?= <danmichaelo@gmail.com>
Date: Sun, 16 Jun 2013 23:29:55 +0200
Subject: [PATCH] PEP8: Fix additional issues not covered by autopep
Adding pytest.ini to ignore E501 long lines for convenience
and W602 since we want to retain backwards compability
---
.travis.yml | 3 +--
mwclient/listing.py | 2 +-
mwclient/page.py | 4 ++--
mwclient/page_nowriteapi.py | 2 +-
pytest.ini | 2 ++
5 files changed, 7 insertions(+), 6 deletions(-)
create mode 100644 pytest.ini
diff --git a/.travis.yml b/.travis.yml
index 7292060..b45f05e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,5 +14,4 @@ before_script:
- pip install -r test_requirements.txt --use-mirrors
script:
- #- py.test --pep8 mwclient -v --doctest-modules tests/client-test.py
- - py.test -v --doctest-modules tests/client-test.py
+ - py.test --pep8 mwclient -v --doctest-modules tests/client-test.py
diff --git a/mwclient/listing.py b/mwclient/listing.py
index 0f5a4bb..9fc9e29 100644
--- a/mwclient/listing.py
+++ b/mwclient/listing.py
@@ -83,7 +83,7 @@ class List(object):
def generate_kwargs(_prefix, *args, **kwargs):
kwargs.update(args)
for key, value in kwargs.iteritems():
- if value != None:
+ if value is not None:
yield _prefix + key, value
@staticmethod
diff --git a/mwclient/page.py b/mwclient/page.py
index 66e77da..bbeeaee 100644
--- a/mwclient/page.py
+++ b/mwclient/page.py
@@ -67,7 +67,7 @@ class Page(object):
def resolve_redirect(self):
""" Returns the redirect target page, or the current page if it's not a redirect page."""
target_page = self.redirects_to()
- if target_page == None:
+ if target_page is None:
return self
else:
return target_page
@@ -205,7 +205,7 @@ class Page(object):
self.last_rev_time = client.parse_timestamp(result['newtimestamp'])
return result['edit']
- def handle_edit_error(self, e, summary):
+ def handle_edit_error(self, e, summary):
if e.code == 'editconflict':
raise errors.EditError(self, summary, e.info)
elif e.code in ('protectedtitle', 'cantcreate', 'cantcreate-anon', 'noimageredirect-anon',
diff --git a/mwclient/page_nowriteapi.py b/mwclient/page_nowriteapi.py
index cfca403..d6f68cd 100644
--- a/mwclient/page_nowriteapi.py
+++ b/mwclient/page_nowriteapi.py
@@ -37,7 +37,7 @@ class OldPage(object):
if page.data:
if page.readonly:
raise errors.ProtectedPageError(self)
- self.get_token('edit', True)
+ self.get_token('edit', True)
raise errors.EditError(page.title, data)
@staticmethod
diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 0000000..7ad3f7d
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+pep8ignore = E501 W602
--
GitLab