Philipp Hörist pushed to branch master at gajim / gajim
Commits:
8483ba50 by Philipp Hörist at 2018-09-18T12:03:58Z
Fix unnecessary-pass pylint errors
- - - - -
a77804f4 by Philipp Hörist at 2018-09-18T12:06:16Z
Fix useless-super-delegation pylint errors
- - - - -
55aab55b by Philipp Hörist at 2018-09-18T12:10:38Z
Fix consider-using-in pylint errors
- - - - -
2512c2b4 by Philipp Hörist at 2018-09-18T12:14:26Z
Update pylint error list
- Check for R1714 consider-using-in
- Check for W0107 unnecessary-pass
- Check for W0235 useless-super-delegation
- - - - -
8 changed files:
- .gitlab-ci.yml
- gajim/gtk/profile.py
- gajim/gtk/service_registration.py
- gajim/gui_interface.py
- gajim/htmltextview.py
- gajim/message_textview.py
- gajim/message_window.py
- scripts/dev/pre-push-tests.sh
Changes:
=====================================
.gitlab-ci.yml
=====================================
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ run-mypy:
run-pylint:
stage: test
script:
- - pylint3 --jobs=2 --additional-builtins=_ --disable=all
--enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,W0102,W0611,W0612,W0621,W0622,W0702,W1201,W1202
gajim
+ - pylint3 --jobs=2 --additional-builtins=_ --disable=all
--enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202
gajim
run-build:
stage: build
=====================================
gajim/gtk/profile.py
=====================================
--- a/gajim/gtk/profile.py
+++ b/gajim/gtk/profile.py
@@ -230,7 +230,7 @@ class ProfileWindow(Gtk.ApplicationWindow):
button.show()
text_button.hide()
continue
- if i == 'ADR' or i == 'TEL' or i == 'EMAIL':
+ if i in ('ADR', 'TEL', 'EMAIL'):
for entry in vcard_[i]:
add_on = '_HOME'
if 'WORK' in entry:
=====================================
gajim/gtk/service_registration.py
=====================================
--- a/gajim/gtk/service_registration.py
+++ b/gajim/gtk/service_registration.py
@@ -81,7 +81,6 @@ class ServiceRegistration(Gtk.Assistant):
elif self.get_current_page() == Page.SENDING:
self._register()
self.commit()
- pass
def _on_get_success(self, form, is_form):
log.info('Show Form page')
@@ -150,9 +149,6 @@ class SendingPage(RequestPage):
title = _('Register')
complete = False
- def __init__(self):
- super().__init__()
-
class FormPage(Gtk.Box):
=====================================
gajim/gui_interface.py
=====================================
--- a/gajim/gui_interface.py
+++ b/gajim/gui_interface.py
@@ -1857,7 +1857,7 @@ class Interface:
emoticons = emoji_data.get_regex()
if app.config.get('ascii_emoticons'):
emoticons += '|%s' % emoji_ascii_data.get_regex()
- pass
+
self.emot_and_basic = '%s|%s' % (basic_pattern, emoticons)
# at least one character in 3 parts (before @, after @, after .)
=====================================
gajim/htmltextview.py
=====================================
--- a/gajim/htmltextview.py
+++ b/gajim/htmltextview.py
@@ -804,7 +804,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler):
newLine = True
elif name == 'img':
pass
- elif name == 'body' or name == 'html':
+ elif name in ('body', 'html'):
pass
elif name == 'a':
pass
=====================================
gajim/message_textview.py
=====================================
--- a/gajim/message_textview.py
+++ b/gajim/message_textview.py
@@ -98,7 +98,7 @@ class MessageTextView(Gtk.TextView):
buf = self.get_buffer()
start, end = buf.get_bounds()
text = buf.get_text(start, end, True)
- return text != self.PLACEHOLDER and text != ''
+ return text not in (self.PLACEHOLDER, '')
def get_text(self):
# gets the text if its not PLACEHOLDER
@@ -211,7 +211,7 @@ class MessageTextView(Gtk.TextView):
_buffer.remove_all_tags(start, finish)
def color_set(self, widget, response):
- if response == -6 or response == -4:
+ if response in (-6, -4):
widget.destroy()
return
@@ -238,7 +238,7 @@ class MessageTextView(Gtk.TextView):
_buffer.apply_tag_by_name(tag_name, start, finish)
def font_set(self, widget, response, start, finish):
- if response == -6 or response == -4:
+ if response in (-6, -4):
widget.destroy()
return
=====================================
gajim/message_window.py
=====================================
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -374,7 +374,7 @@ class MessageWindow:
self.window.lookup_action(
'information-%s' % control.control_id).activate()
return True
- elif keyval == Gdk.KEY_l or keyval == Gdk.KEY_L: # CTRL + l|L
+ elif keyval in (Gdk.KEY_l, Gdk.KEY_L): # CTRL + l|L
control.conv_textview.clear()
return True
elif keyval == Gdk.KEY_u: # CTRL + u: emacs style clear line
=====================================
scripts/dev/pre-push-tests.sh
=====================================
--- a/scripts/dev/pre-push-tests.sh
+++ b/scripts/dev/pre-push-tests.sh
@@ -1,2 +1,2 @@
mypy -p gajim.common.modules --follow-imports=skip
-pylint --jobs=2 --additional-builtins=_ --disable=all
--enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,W0102,W0611,W0612,W0621,W0622,W0702,W1201,W1202
gajim
+pylint --jobs=2 --additional-builtins=_ --disable=all
--enable=C0121,C0201,C0303,C0321,C0325,C0326,C1801,E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701,R0123,R0205,R1703,R1704,R1705,R1707,R1714,W0102,W0107,W0235,W0611,W0612,W0621,W0622,W0702,W1201,W1202
gajim
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/376fff7871a93cedba43e5e03d5a0e7fd35ab025...2512c2b48426778e61b705ad9a6cbb50fa2e1b77
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/compare/376fff7871a93cedba43e5e03d5a0e7fd35ab025...2512c2b48426778e61b705ad9a6cbb50fa2e1b77
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
