Philipp Hörist pushed to branch master at gajim / gajim

Commits: 7bb6f8b2 by Philipp Hörist at 2018-09-16T21:45:01Z Fix bare-except pylint errors

- - - - - 9bab139b by Philipp Hörist at 2018-09-16T21:46:16Z Update pylint error list

Check for W0702 bare-except

- - - - -

13 changed files:

- .gitlab-ci.yml - gajim/advanced_configuration_window.py - gajim/common/jingle_rtp.py - gajim/common/jingle_xtls.py - gajim/common/modules/dataforms.py - gajim/common/protocol/bytestream.py - gajim/dev/ipython_view.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/htmltextview.py - gajim/plugins/gajimplugin.py - plugins/dbus_plugin/plugin.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=C1801,C0325,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,R0205,W0102,W0611,W0621 gajim + - pylint3 --jobs=2 --additional-builtins=_ --disable=all --enable=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702 gajim

run-build: stage: build

===================================== gajim/advanced_configuration_window.py ===================================== --- a/gajim/advanced_configuration_window.py +++ b/gajim/advanced_configuration_window.py @@ -306,7 +306,7 @@ class AdvancedConfigurationWindow: else: try: value = str(option) - except: + except Exception: value = option self.model.append(parent, [name, value, type_])

===================================== gajim/common/jingle_rtp.py ===================================== --- a/gajim/common/jingle_rtp.py +++ b/gajim/common/jingle_rtp.py @@ -412,7 +412,7 @@ class JingleVideo(JingleRTPContent): framerate = '' try: w, h = app.config.get('video_size').split('x') - except: + except Exception: w = h = None if w and h: video_size = 'video/x-raw,width=%s,height=%s ! ' % (w, h)

===================================== gajim/common/jingle_xtls.py ===================================== --- a/gajim/common/jingle_xtls.py +++ b/gajim/common/jingle_xtls.py @@ -85,7 +85,7 @@ def load_cert_file(cert_path, cert_store=None): except OpenSSL.crypto.Error as exception_obj: log.warning('Unable to load a certificate from file %s: %s', cert_path, exception_obj.args[0][0][2]) - except: + except Exception: log.warning('Unknown error while loading certificate from file ' '%s', cert_path) begin = -1

===================================== gajim/common/modules/dataforms.py ===================================== --- a/gajim/common/modules/dataforms.py +++ b/gajim/common/modules/dataforms.py @@ -741,7 +741,7 @@ class MultipleDataForm(DataForm): # def reported(self, record): # try: # self.delChild('reported') -# except: +# except Exception: # pass # # record.setName('reported')

===================================== gajim/common/protocol/bytestream.py ===================================== --- a/gajim/common/protocol/bytestream.py +++ b/gajim/common/protocol/bytestream.py @@ -813,7 +813,7 @@ class ConnectionIBBytestream(ConnectionBytestream): file_props = FilesProp.getFilePropByTransportSid(self.name, sid) try: blocksize = int(blocksize) - except: + except Exception: err = nbxmpp.ERR_BAD_REQUEST if not sid or not blocksize: err = nbxmpp.ERR_BAD_REQUEST

===================================== gajim/dev/ipython_view.py ===================================== --- a/gajim/dev/ipython_view.py +++ b/gajim/dev/ipython_view.py @@ -193,7 +193,7 @@ class IterableIPShell: if self.iter_more: try: self.prompt = self.generatePrompt(True) - except: + except Exception: self.IP.showtraceback() if self.IP.autoindent: self.IP.rl_do_indent = True @@ -203,7 +203,7 @@ class IterableIPShell: except KeyboardInterrupt: self.IP.write('\nKeyboardInterrupt\n') self.IP.input_splitter.reset() - except: + except Exception: self.IP.showtraceback() else: self.IP.input_splitter.push(line)

===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -37,7 +37,7 @@ import xml.etree.ElementTree as ET

try: from PIL import Image -except: +except Exception: pass from io import BytesIO

===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -48,7 +48,7 @@ import OpenSSL

try: from PIL import Image -except: +except Exception: pass

from gajim.common import app @@ -934,7 +934,7 @@ class Interface: h = Hashes2() try: file_ = open(file_props.file_name, 'rb') - except: + except Exception: return hash_ = h.calculateHash(file_props.algo, file_) file_.close()

===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -283,7 +283,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): def get_val(min_val=minl, max_val=maxl): try: val = float(value[:-2]) - except: + except Exception: log.warning('Unable to parse length value "%s"', value) return None if val > 0:

===================================== gajim/plugins/gajimplugin.py ===================================== --- a/gajim/plugins/gajimplugin.py +++ b/gajim/plugins/gajimplugin.py @@ -258,7 +258,7 @@ class GajimPluginConfig(): try: self.data = pickle.load(fd) fd.close() - except: + except Exception: fd.close() try: import shelve @@ -269,7 +269,7 @@ class GajimPluginConfig(): raise GajimPluginException s.close() self.save() - except: + except Exception: log.warning('%s plugin config file not readable. Saving it as ' '%s and creating a new one' % (self.plugin.short_name, self.FILE_PATH.decode(locale.getpreferredencoding()) + '.bak'))

===================================== plugins/dbus_plugin/plugin.py ===================================== --- a/plugins/dbus_plugin/plugin.py +++ b/plugins/dbus_plugin/plugin.py @@ -328,7 +328,7 @@ if dbus_support.supported: jid = self._get_real_jid(jid, account) try: jid = helpers.parse_jid(jid) - except: + except Exception: # Jid is not conform, ignore it return DBUS_BOOLEAN(False)

===================================== 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=C1801,C0325,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,R0205,W0102,W0611,W0621 gajim +pylint --jobs=2 --additional-builtins=_ --disable=all --enable=C1801,C0325,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,R0205,W0102,W0611,W0621,W0702 gajim

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b8bbcf2be098e69ce061dfa064bdc8ecc3...