Philipp Hörist pushed to branch master at gajim / gajim
Commits: 3b3c2af9 by Philipp Hörist at 2019-04-07T19:15:39Z Fix wrong-import-position pylint errors
- - - - - cf40a2a8 by Philipp Hörist at 2019-04-07T19:20:21Z Fix wrong-import-order pylint errors
- - - - - 7ef066b1 by Philipp Hörist at 2019-04-07T19:29:45Z Fix ungrouped-imports pylint errors
- - - - - b8d70abd by Philipp Hörist at 2019-04-07T19:32:55Z Enable wildcard-import pylint check
- - - - - 33f62cec by Philipp Hörist at 2019-04-07T19:44:42Z Fix bad-indentation pylint errors
- - - - - b91b6499 by Philipp Hörist at 2019-04-07T19:47:00Z Fix no-callable pylint errors
- - - - - b54aba4d by Philipp Hörist at 2019-04-07T19:50:33Z Fix access-member-before-definition pylint errors
- - - - -
18 changed files:
- gajim/chat_control_base.py - gajim/common/caps_cache.py - gajim/common/connection.py - gajim/common/dbus/location.py - gajim/common/jingle_ftstates.py - gajim/common/jingle_rtp.py - gajim/common/modules/base.py - gajim/common/multimedia_helpers.py - gajim/common/protocol/bytestream.py - gajim/common/proxy65_manager.py - gajim/conversation_textview.py - gajim/dev/ipython_view.py - gajim/groupchat_control.py - gajim/gtk/preferences.py - gajim/gtk/single_message.py - gajim/history_manager.py - gajim/message_textview.py - scripts/dev/pylint-ci.sh
Changes:
===================================== gajim/chat_control_base.py ===================================== @@ -75,7 +75,7 @@ from gajim.command_system.implementation import execute # pylint: enable=unused-import
if app.is_installed('GSPELL'): - from gi.repository import Gspell + from gi.repository import Gspell # pylint: disable=ungrouped-imports
################################################################################
===================================== gajim/common/caps_cache.py ===================================== @@ -29,10 +29,8 @@ through ClientCaps objects which are hold by contact instances.
import base64 import hashlib -from collections import namedtuple - import logging -log = logging.getLogger('gajim.c.caps_cache') +from collections import namedtuple
import nbxmpp from nbxmpp.const import Affiliation @@ -44,6 +42,8 @@ FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION, NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO, NS_JINGLE_FILE_TRANSFER_5]
+log = logging.getLogger('gajim.c.caps_cache') + # Query entry status codes NEW = 0 QUERIED = 1
===================================== gajim/common/connection.py ===================================== @@ -32,7 +32,7 @@ import sys import random import socket import operator -import string + import time import hashlib import json @@ -40,13 +40,13 @@ import logging import base64 import ssl from functools import partial +import string from string import Template from urllib.request import urlopen from urllib.error import URLError
from gi.repository import GLib -if sys.platform in ('win32', 'darwin'): - import certifi + import OpenSSL.crypto import nbxmpp from nbxmpp.const import Realm @@ -76,6 +76,9 @@ from gajim.common.connection_handlers_events import NewAccountConnectedEvent from gajim.common.connection_handlers_events import NewAccountNotConnectedEvent from gajim.common.connection_handlers_events import MessageSentEvent
+if sys.platform in ('win32', 'darwin'): + import certifi +
log = logging.getLogger('gajim.c.connection')
===================================== gajim/common/dbus/location.py ===================================== @@ -23,7 +23,7 @@ from nbxmpp.structs import LocationData from gajim.common import app
if app.is_installed('GEOCLUE'): - from gi.repository import Geoclue + from gi.repository import Geoclue # pylint: disable=ungrouped-imports
log = logging.getLogger('gajim.c.dbus.location')
===================================== gajim/common/jingle_ftstates.py ===================================== @@ -12,12 +12,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see http://www.gnu.org/licenses/.
+import logging + import nbxmpp from gajim.common import app from gajim.common.jingle_transport import TransportType -from gajim.common.socks5 import Socks5ReceiverClient, Socks5SenderClient +from gajim.common.socks5 import Socks5ReceiverClient +from gajim.common.socks5 import Socks5SenderClient
-import logging log = logging.getLogger('gajim.c.jingle_ftstates')
===================================== gajim/common/jingle_rtp.py ===================================== @@ -18,22 +18,22 @@ Handles Jingle RTP sessions (XEP 0167)
import logging import socket +from collections import deque + import nbxmpp -import gi from gi.repository import Farstream - -gi.require_version('Gst', '1.0') from gi.repository import Gst from gi.repository import GLib
from gajim.common import app from gajim.common.i18n import _ from gajim.common.jingle_transport import JingleTransportICEUDP -from gajim.common.jingle_content import contents, JingleContent, JingleContentSetupException +from gajim.common.jingle_content import contents +from gajim.common.jingle_content import JingleContent +from gajim.common.jingle_content import JingleContentSetupException from gajim.common.connection_handlers_events import InformationEvent from gajim.common.jingle_session import FailedApplication
-from collections import deque
log = logging.getLogger('gajim.c.jingle_rtp')
===================================== gajim/common/modules/base.py ===================================== @@ -85,4 +85,4 @@ class BaseModule: if self._stored_publish is None: return self._log.info('Send stored publish') - self._stored_publish() + self._stored_publish() # pylint: disable=not-callable
===================================== gajim/common/multimedia_helpers.py ===================================== @@ -14,9 +14,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see http://www.gnu.org/licenses/.
-import gi import logging -gi.require_version('Gst', '1.0') + from gi.repository import Gst
from gajim.common.i18n import _
===================================== gajim/common/protocol/bytestream.py ===================================== @@ -26,10 +26,12 @@
import socket import base64 -from gi.repository import GLib import time +import logging
import nbxmpp +from gi.repository import GLib + from gajim.common import app from gajim.common import helpers from gajim.common import ged @@ -37,7 +39,7 @@ from gajim.common import jingle_xtls from gajim.common.file_props import FilesProp from gajim.common.socks5 import Socks5SenderClient
-import logging + log = logging.getLogger('gajim.c.p.bytestream')
def is_transfer_paused(file_props):
===================================== gajim/common/proxy65_manager.py ===================================== @@ -20,15 +20,17 @@ import socket import struct import errno import logging -log = logging.getLogger('gajim.c.proxy65_manager')
import nbxmpp +from nbxmpp.idlequeue import IdleObject + from gajim.common import app from gajim.common import helpers from gajim.common.socks5 import Socks5 -from nbxmpp.idlequeue import IdleObject from gajim.common.file_props import FilesProp
+log = logging.getLogger('gajim.c.proxy65_manager') + S_INITIAL = 0 S_STARTED = 1 S_RESOLVED = 2
===================================== gajim/conversation_textview.py ===================================== @@ -805,10 +805,10 @@ class ConversationTextview(GObject.GObject): emoji_pixbufs.append_marks( self.tv, start_mark, end_mark, special_text)
- elif special_text.startswith('www.') or \ - special_text.startswith('ftp.') or \ - text_is_valid_uri and not is_xhtml_link: - tags.append('url') + elif (special_text.startswith('www.') or + special_text.startswith('ftp.') or + text_is_valid_uri and not is_xhtml_link): + tags.append('url') elif special_text.startswith('mailto:') and not is_xhtml_link: tags.append('mail') elif special_text.startswith('xmpp:') and not is_xhtml_link:
===================================== gajim/dev/ipython_view.py ===================================== @@ -60,8 +60,10 @@ except ImportError: HAS_IPYTHON5 = True try: from pygments.token import Token + # pylint: disable=ungrouped-imports from IPython.core.displayhook import DisplayHook from IPython.core.display_trap import DisplayTrap + # pylint: enable=ungrouped-imports
class MyPromptDisplayHook(DisplayHook): def __init__(self, shell, view):
===================================== gajim/groupchat_control.py ===================================== @@ -1158,7 +1158,7 @@ class GroupchatControl(ChatControlBase): if self.form_widget: self.form_widget.hide() self.form_widget.destroy() - self.btn_box.destroy() + self.btn_box.destroy() # pylint: disable=access-member-before-definition
self.form_widget = DataFormWidget(event.form)
===================================== gajim/gtk/preferences.py ===================================== @@ -47,7 +47,7 @@ except (ImportError, ValueError): HAS_GST = False
if app.is_installed('GSPELL'): - from gi.repository import Gspell + from gi.repository import Gspell # pylint: disable=ungrouped-imports
class Preferences(Gtk.ApplicationWindow):
===================================== gajim/gtk/single_message.py ===================================== @@ -34,7 +34,7 @@ from gajim.gtk.util import move_window from gajim.gtk.util import resize_window
if app.is_installed('GSPELL'): - from gi.repository import Gspell + from gi.repository import Gspell # pylint: disable=ungrouped-imports
class SingleMessageWindow:
===================================== gajim/history_manager.py ===================================== @@ -32,11 +32,6 @@ import getopt import sqlite3 from enum import IntEnum, unique
-import gi -gi.require_version('Gtk', '3.0') -gi.require_version('GLib', '2.0') -gi.require_version('Gdk', '3.0') -gi.require_version('Gio', '2.0') from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib @@ -85,6 +80,7 @@ if is_standalone(): configpaths.init() app.load_css_config()
+# pylint: disable=C0413 from gajim.common import helpers from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import ErrorDialog @@ -94,7 +90,7 @@ from gajim.gtk.filechoosers import FileSaveDialog from gajim.gtk.util import convert_rgb_to_hex from gajim.gtk.util import get_builder from gajim.gtk.util import get_app_icon_list - +# pylint: enable=C0413
@unique class Column(IntEnum):
===================================== gajim/message_textview.py ===================================== @@ -31,7 +31,7 @@ from gajim.common.const import StyleAttr from gajim.gtk.util import scroll_to_end
if app.is_installed('GSPELL'): - from gi.repository import Gspell + from gi.repository import Gspell # pylint: disable=ungrouped-imports
class MessageTextView(Gtk.TextView):
===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,22 +1,17 @@ #!/bin/sh PYLINT=${PYLINT:-pylint}
-"$PYLINT" --disable=C0103,C0302,C0301,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0311,W0401,W0603,W0613 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,E0710,E0712,E1101,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@"
# C0103 invalid-name # C0301 line-too-long # C0302 too-many-lines # C0330 bad-continuation -# C0411 wrong-import-order -# C0412 ungrouped-imports -# C0413 wrong-import-position -# E0203 access-member-before-definition # E0401 import-error # E0611 no-name-in-module # E0710 raising-non-exception - GLib.GError is not recognized # E0712 catching-non-exception - GLib.GError is not recognized # E1101 no-member -# E1102 not-callable # E1133 not-an-iterable # E1136 unsubscriptable-object # R0201 no-self-use @@ -35,7 +30,5 @@ PYLINT=${PYLINT:-pylint} # W0223 abstract-method # W0231 super-init-not-called # W0233 non-parent-init-called -# W0311 bad-indentation -# W0401 wildcard-import # W0603 global-statement # W0613 unused-argument
View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d55cb97dd294e30aa5b65185e62edf9b72...