Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][gajim_1.1] Update ChangeLog
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: 27e2786b by Philipp Hörist at 2019-04-09T19:06:15Z Update ChangeLog - - - - - 1 changed file: - ChangeLog Changes: ===================================== ChangeLog ===================================== @@ -1,21 +1,27 @@ Gajim 1.1.3 (TBA) + New + + * Add a mobile phone indicator to the chat window + * Rework HTTPUpload dialog + * Add a "paste as quote" option to the message input + Bug fixes + * #8822 Fix memory leak when using spell checker * #9514 Fix jingle filetransfers not working in some circumstances * #9573 Dont leak DNS query when connecting over proxy * #9578 Determine Windows version more reliably * #9622 Fix an error while quitting Gajim + * #9633 Fix an error while sending a file * #9637 Restore window size correctly on wayland * Improve dark theme colors * Fix access to GnuPG keys * Use UUID4 item ids for pubsub posts + * Dont send invalid show values + * Windows: Dont override format region settings * Various smaller improvements - Features - - * Add a mobile phone indicator to the chat window - Gajim 1.1.2 (15 January 2019) Bug fixes View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27e2786bccbdfd16183ff1910baf7bfbb2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/27e2786bccbdfd16183ff1910baf7bfbb2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.1] 2 commits: Fix memory leak with spell checker
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch gajim_1.1 at gajim / gajim Commits: bf804f18 by Philipp Hörist at 2019-04-09T18:57:47Z Fix memory leak with spell checker - Dont shadow widgets destroy() - Dont bind spell checker to class attribute, this prevents its finalize Fixes #8822 - - - - - db942378 by Marcin Mielniczuk at 2019-04-09T18:58:16Z Add the possibility to paste as quote - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/message_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -323,7 +323,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.set_emoticon_popover() # Attach speller - self.spell_checker = None self.set_speller() self.conv_textview.tv.show() @@ -474,15 +473,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if gspell_lang is None: return - self.spell_checker = Gspell.Checker.new(gspell_lang) + spell_checker = Gspell.Checker.new(gspell_lang) spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( self.msg_textview.get_buffer()) - spell_buffer.set_spell_checker(self.spell_checker) + spell_buffer.set_spell_checker(spell_checker) spell_view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) spell_view.set_inline_spell_checking(False) spell_view.set_enable_language_menu(True) - self.spell_checker.connect('notify::language', self.on_language_changed) + spell_checker.connect('notify::language', self.on_language_changed) def get_speller_language(self): per_type = 'contacts' @@ -560,14 +559,27 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): id_ = item.connect('activate', self.msg_textview.clear) self.handlers[id_] = item + paste_item = Gtk.MenuItem.new_with_label(_('Paste as quote')) + id_ = paste_item.connect('activate', self.paste_clipboard_as_quote) + self.handlers[id_] = paste_item + menu.append(paste_item) + menu.show_all() - def on_quote(self, widget, text): + def insert_as_quote(self, text: str) -> None: self.msg_textview.remove_placeholder() - text = '>' + text.replace('\n', '\n>') + '\n' + text = '> ' + text.replace('\n', '\n> ') + '\n' message_buffer = self.msg_textview.get_buffer() message_buffer.insert_at_cursor(text) + def paste_clipboard_as_quote(self, _item: Gtk.MenuItem) -> None: + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + text = clipboard.wait_for_text() + self.insert_as_quote(text) + + def on_quote(self, widget, text): + self.insert_as_quote(text) + # moved from ChatControl def _on_banner_eventbox_button_press_event(self, widget, event): """ ===================================== gajim/message_textview.py ===================================== @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import gc - from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject @@ -408,9 +406,6 @@ class MessageTextView(Gtk.TextView): self.add_child_at_anchor(image, anchor) buffer_.insert_at_cursor(' ') - def destroy(self): - GLib.idle_add(gc.collect) - def clear(self, widget=None): """ Clear text in the textview View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5f562fb0ab829c3d6e412ee723ebcbe9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5f562fb0ab829c3d6e412ee723ebcbe9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add the possibility to paste as quote
by Philipp Hörist 09 Apr '19

09 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 64d14013 by Marcin Mielniczuk at 2019-04-09T16:47:12Z Add the possibility to paste as quote - - - - - 1 changed file: - gajim/chat_control_base.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -540,14 +540,27 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): id_ = item.connect('activate', self.msg_textview.clear) self.handlers[id_] = item + paste_item = Gtk.MenuItem.new_with_label(_('Paste as quote')) + id_ = paste_item.connect('activate', self.paste_clipboard_as_quote) + self.handlers[id_] = paste_item + menu.append(paste_item) + menu.show_all() - def on_quote(self, widget, text): + def insert_as_quote(self, text: str) -> None: self.msg_textview.remove_placeholder() - text = '>' + text.replace('\n', '\n>') + '\n' + text = '> ' + text.replace('\n', '\n> ') + '\n' message_buffer = self.msg_textview.get_buffer() message_buffer.insert_at_cursor(text) + def paste_clipboard_as_quote(self, _item: Gtk.MenuItem) -> None: + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + text = clipboard.wait_for_text() + self.insert_as_quote(text) + + def on_quote(self, widget, text): + self.insert_as_quote(text) + # moved from ChatControl def _on_banner_eventbox_button_press_event(self, widget, event): """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/64d14013079c99673e8b9441c152b7d4c1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/64d14013079c99673e8b9441c152b7d4c1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix memory leak with spell checker
by Philipp Hörist 08 Apr '19

08 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4ac532c3 by Philipp Hörist at 2019-04-08T20:45:26Z Fix memory leak with spell checker - Dont shadow widgets destroy() - Dont bind spell checker to class attribute, this prevents its finalize Fixes #8822 - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/message_textview.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -323,7 +323,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.set_emoticon_popover() # Attach speller - self.spell_checker = None self.set_speller() self.conv_textview.tv.show() @@ -454,15 +453,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if gspell_lang is None: return - self.spell_checker = Gspell.Checker.new(gspell_lang) + spell_checker = Gspell.Checker.new(gspell_lang) spell_buffer = Gspell.TextBuffer.get_from_gtk_text_buffer( self.msg_textview.get_buffer()) - spell_buffer.set_spell_checker(self.spell_checker) + spell_buffer.set_spell_checker(spell_checker) spell_view = Gspell.TextView.get_from_gtk_text_view(self.msg_textview) spell_view.set_inline_spell_checking(False) spell_view.set_enable_language_menu(True) - self.spell_checker.connect('notify::language', self.on_language_changed) + spell_checker.connect('notify::language', self.on_language_changed) def get_speller_language(self): per_type = 'contacts' ===================================== gajim/message_textview.py ===================================== @@ -17,8 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -import gc - from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject @@ -413,9 +411,6 @@ class MessageTextView(Gtk.TextView): self.add_child_at_anchor(image, anchor) buffer_.insert_at_cursor(' ') - def destroy(self): - GLib.idle_add(gc.collect) - def clear(self, widget=None): """ Clear text in the textview View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ac532c3fa5d9e6ca8f558e4270b2138f9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4ac532c3fa5d9e6ca8f558e4270b2138f9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Disable some pylint checks
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24d939ce by Philipp Hörist at 2019-04-07T21:34:43Z Disable some pylint checks Gtk Objects like a TreeModel is not detected correctly - E0611 no-name-in-module - E1133 not-an-iterable - E1136 unsubscriptable-object - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,14 +1,17 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} -"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E1101,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0603,W0613 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E0611,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 # E0401 import-error +# E0611 no-name-in-module # E1101 no-member +# E1133 not-an-iterable +# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24d939ce41bce47df1e91f8d333b9bd42a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/24d939ce41bce47df1e91f8d333b9bd42a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Enable more pylint checks
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3808c85c by Philipp Hörist at 2019-04-07T21:07:59Z Enable more pylint checks - E0611 no-name-in-module - E0710 raising-non-exception - E0712 catching-non-exception - E1133 not-an-iterable - E1136 unsubscriptable-object - - - - - 1 changed file: - scripts/dev/pylint-ci.sh Changes: ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,19 +1,14 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} -"$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 "$@" +"$PYLINT" --disable=C0103,C0302,C0301,C0330,E0401,E1101,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 # 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 -# E1133 not-an-iterable -# E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3808c85cbda0dfb100adcb3376de895020… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3808c85cbda0dfb100adcb3376de895020… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Fix wrong-import-position pylint errors
by Philipp Hörist 07 Apr '19

07 Apr '19

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/d55cb97dd294e30aa5b65185e62edf9b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/d55cb97dd294e30aa5b65185e62edf9b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Add description for some pylint errors
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8ca9c1d6 by Philipp Hörist at 2019-04-07T17:04:21Z Add description for some pylint errors - - - - - dc3910ce by Philipp Hörist at 2019-04-07T17:07:16Z Fix useless-return pylint errors - - - - - 20d3e981 by Philipp Hörist at 2019-04-07T17:48:09Z Fix consider-using-ternary pylint errors - - - - - ee38f760 by Philipp Hörist at 2019-04-07T17:50:15Z Fix chained-comparison pylint errors - - - - - 1c39d66d by Philipp Hörist at 2019-04-07T18:13:55Z Fix assignment-from-none pylint errors - - - - - f62f9227 by Philipp Hörist at 2019-04-07T18:27:07Z Fix unused-wildcard-import pylint errors - - - - - d55cb97d by Philipp Hörist at 2019-04-07T18:41:27Z Update pylintrc - Ignore some pylint errors only in CI, not locally - Set max line length to 80 - - - - - 12 changed files: - gajim/chat_control_base.py - gajim/common/optparser.py - gajim/common/protocol/bytestream.py - gajim/common/socks5.py - gajim/common/zeroconf/zeroconf_avahi.py - gajim/common/zeroconf/zeroconf_avahi_const.py - gajim/dialogs.py - gajim/gui_interface.py - gajim/message_window.py - gajim/roster_window.py - pylintrc - scripts/dev/pylint-ci.sh Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -497,7 +497,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): item = Gtk.SeparatorMenuItem.new() menu.prepend(item) - menu2 = self.prepare_context_menu() + menu2 = self.prepare_context_menu() # pylint: disable=assignment-from-none i = 0 for item in menu2: menu2.remove(item) ===================================== gajim/common/optparser.py ===================================== @@ -113,14 +113,16 @@ class OptionsParser: app.config.foreach(self.write_line, file) except IOError: log.exception('Failed to write config file') - return + return False try: temp_filepath.replace(config_path) except Exception: log.exception('Failed to replace config file') - else: - log.info('Successful saved config file') + return False + + log.info('Successful saved config file') + return True def update_config(self, old_version, new_version): old_version_list = old_version.split('.') # convert '0.x.y' to (0, x, y) ===================================== gajim/common/protocol/bytestream.py ===================================== @@ -563,7 +563,6 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): """ file_props = FilesProp.getFilePropBySid(sid) file_props.hash_ = hash_id - return def _connect_error(self, sid, error, error_type, msg=None): """ ===================================== gajim/common/socks5.py ===================================== @@ -1297,8 +1297,7 @@ class Socks5Client(Socks5): return if self.state < 5: self.idlequeue.set_read_timeout(self.fd, CONNECT_TIMEOUT) - result = self.main(0) - self.queue.process_result(result, self) + self.main(0) elif self.state == 5: # wait for proxy reply pass elif self.file_props.type_ == 'r': ===================================== gajim/common/zeroconf/zeroconf_avahi.py ===================================== @@ -15,17 +15,25 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging -log = logging.getLogger('gajim.c.z.zeroconf_avahi') -import gi -gi.require_version('Avahi', '0.6') from gi.repository import Avahi from gi.repository import Gio from gi.repository import GLib from gajim.common.i18n import _ from gajim.common.zeroconf.zeroconf import Constant, ConstantRI -from gajim.common.zeroconf.zeroconf_avahi_const import * +from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_NAME +from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_SERVER +from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_ENTRY_GROUP +from gajim.common.zeroconf.zeroconf_avahi_const import DBUS_INTERFACE_DOMAIN_BROWSER +from gajim.common.zeroconf.zeroconf_avahi_const import ServerState +from gajim.common.zeroconf.zeroconf_avahi_const import EntryGroup +from gajim.common.zeroconf.zeroconf_avahi_const import DomainBrowser +from gajim.common.zeroconf.zeroconf_avahi_const import Protocol +from gajim.common.zeroconf.zeroconf_avahi_const import Interface + +log = logging.getLogger('gajim.c.z.zeroconf_avahi') + class Zeroconf: def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, ===================================== gajim/common/zeroconf/zeroconf_avahi_const.py ===================================== @@ -20,15 +20,8 @@ from enum import IntEnum DBUS_NAME = "org.freedesktop.Avahi" DBUS_INTERFACE_SERVER = DBUS_NAME + ".Server" -DBUS_PATH_SERVER = "/" DBUS_INTERFACE_ENTRY_GROUP = DBUS_NAME + ".EntryGroup" DBUS_INTERFACE_DOMAIN_BROWSER = DBUS_NAME + ".DomainBrowser" -DBUS_INTERFACE_SERVICE_TYPE_BROWSER = DBUS_NAME + ".ServiceTypeBrowser" -DBUS_INTERFACE_SERVICE_BROWSER = DBUS_NAME + ".ServiceBrowser" -DBUS_INTERFACE_ADDRESS_RESOLVER = DBUS_NAME + ".AddressResolver" -DBUS_INTERFACE_HOST_NAME_RESOLVER = DBUS_NAME + ".HostNameResolver" -DBUS_INTERFACE_SERVICE_RESOLVER = DBUS_NAME + ".ServiceResolver" -DBUS_INTERFACE_RECORD_BROWSER = DBUS_NAME + ".RecordBrowser" class ServerState(IntEnum): ===================================== gajim/dialogs.py ===================================== @@ -50,8 +50,10 @@ from gajim.common import i18n from gajim.common.modules import dataforms from gajim.common.exceptions import GajimGeneralException -# Compat with Gajim 1.0.3 for plugins -from gajim.gtk.dialogs import * +from gajim.gtk.dialogs import ErrorDialog +from gajim.gtk.dialogs import ConfirmationDialog +from gajim.gtk.dialogs import InputDialog +from gajim.gtk.dialogs import InformationDialog from gajim.gtk.util import get_icon_name from gajim.gtk.util import resize_window from gajim.gtk.util import get_builder @@ -1399,9 +1401,6 @@ class Dialog(Gtk.Dialog): def just_destroy(self, widget): self.destroy() - def get_button(self, index): - buttons = self.get_action_area().get_children() - return index < len(buttons) and buttons[index] or None class DataFormWindow(Dialog): def __init__(self, form, on_response_ok): ===================================== gajim/gui_interface.py ===================================== @@ -2038,15 +2038,12 @@ class Interface: @staticmethod def save_config(): - err_str = parser.write() - if err_str is not None: - print(err_str, file=sys.stderr) - # it is good to notify the user - # in case he or she cannot see the output of the console - error_dialog = ErrorDialog(_('Could not save your settings and ' - 'preferences'), err_str) - error_dialog.run() - sys.exit() + if parser.write(): + return + + error_dialog = ErrorDialog( + _('Could not save your settings and preferences')) + error_dialog.run() @staticmethod def update_avatar(account=None, jid=None, contact=None, room_avatar=False): ===================================== gajim/message_window.py ===================================== @@ -890,15 +890,13 @@ class MessageWindow: tab = self.notebook.get_tab_label(page) tab_alloc = tab.get_allocation() if horiz: - if (x >= tab_alloc.x) and \ - (x <= (tab_alloc.x + tab_alloc.width)): + if tab_alloc.x <= x <= (tab_alloc.x + tab_alloc.width): page_num = i if x >= tab_alloc.x + (tab_alloc.width / 2.0): to_right = True break else: - if (y >= tab_alloc.y) and \ - (y <= (tab_alloc.y + tab_alloc.height)): + if tab_alloc.y <= y <= (tab_alloc.y + tab_alloc.height): page_num = i if y > tab_alloc.y + (tab_alloc.height / 2.0): ===================================== gajim/roster_window.py ===================================== @@ -3308,7 +3308,7 @@ class RosterWindow: not event.get_state() & Gdk.ModifierType.CONTROL_MASK): # Don't handle double click if we press icon of a metacontact titer = model.get_iter(path) - if x > x_min and x < x_min + 27 and type_ == 'contact' and \ + if x_min < x < x_min + 27 and type_ == 'contact' and \ model.iter_has_child(titer): if self.tree.row_expanded(path): self.tree.collapse_row(path) @@ -3328,7 +3328,7 @@ class RosterWindow: else: self.expand_group_row(path) - elif type_ == 'contact' and x > x_min and x < x_min + 27: + elif type_ == 'contact' and x_min < x < x_min + 27: if self.tree.row_expanded(path): self.tree.collapse_row(path) else: @@ -4461,8 +4461,9 @@ class RosterWindow: return # Is the contact we drag a meta contact? - accounts = (self.regroup and app.contacts.get_accounts()) or \ - account_source + accounts = account_source + if self.regroup: + accounts = app.contacts.get_accounts() or account_source is_big_brother = app.contacts.is_big_brother(account_source, jid_source, accounts) ===================================== pylintrc ===================================== @@ -50,7 +50,9 @@ confidence= # --enable=similarities". If you want to run only the classes checker, but have # no Warning level messages displayed, use"--disable=all --enable=classes # --disable=W" -disable=C0111,C0301,R1710,R0912,R0914,R0915,W0511,W0231,W0233 +# C0111 missing-docstring +# W0511 fix-me +disable=C0111,W0511 # Enable the message, report, category or checker with the given id(s). You can # either give multiple identifier separated by comma (,) or put this option @@ -220,7 +222,7 @@ indent-after-paren=4 indent-string=' ' # Maximum number of characters on a single line. -max-line-length=100 +max-line-length=80 # Maximum number of lines in a module max-module-lines=1000 ===================================== scripts/dev/pylint-ci.sh ===================================== @@ -1,9 +1,10 @@ #!/bin/sh PYLINT=${PYLINT:-pylint} -"$PYLINT" --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1128,E1133,E1136,R0201,R0901,R0904,R0913,R0916,R1702,R1706,R1711,R1716,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 "$@" +"$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 "$@" # C0103 invalid-name +# C0301 line-too-long # C0302 too-many-lines # C0330 bad-continuation # C0411 wrong-import-order @@ -16,24 +17,25 @@ PYLINT=${PYLINT:-pylint} # E0712 catching-non-exception - GLib.GError is not recognized # E1101 no-member # E1102 not-callable -# E1128 assignment-from-none # E1133 not-an-iterable # E1136 unsubscriptable-object # R0201 no-self-use # R0901 too-many-ancestors # R0904 too-many-public-methods # R0913 too-many-arguments +# R0912 too-many-branches +# R0914 too-many-locals +# R0915 too-many-statements # R0916 too-many-boolean-expressions -# R1702 -# R1706 -# R1711 -# R1716 +# R1702 too-many-nested-blocks +# R1710 inconsistent-return-statements # W0201 attribute-defined-outside-init # W0212 protected-access # W0221 arguments-differ # 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 -# W0614 unused-wildcard-import View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5471980a8cce499509d323f3423cebec9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/5471980a8cce499509d323f3423cebec9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: Fix unused-import pylint errors
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3b221177 by Philipp Hörist at 2019-04-07T16:14:54Z Fix unused-import pylint errors - - - - - 47dae61e by Philipp Hörist at 2019-04-07T16:20:15Z Fix unnecessary-pass pylint errors - - - - - b09f94da by Philipp Hörist at 2019-04-07T16:22:45Z Fix simplifiable-if-expression pylint errors - - - - - 30f850b5 by Philipp Hörist at 2019-04-07T16:26:29Z Fix no-else-return pylint errors - - - - - c8815a92 by Philipp Hörist at 2019-04-07T16:40:32Z Fix no-else-raise pylint errors - - - - - 0dbb3eb1 by Philipp Hörist at 2019-04-07T16:48:51Z Fix comparison-with-callable pylint errors - - - - - 5471980a by Philipp Hörist at 2019-04-07T16:49:27Z Update pylint to 2.3.1 - - - - - 24 changed files: - .gitlab-ci.yml - gajim/chat_control_base.py - gajim/command_system/errors.py - gajim/command_system/framework.py - gajim/common/app.py - gajim/common/events.py - gajim/common/exceptions.py - gajim/common/fuzzyclock.py - gajim/common/jingle_ft.py - gajim/common/jingle_session.py - gajim/common/jingle_transport.py - gajim/common/modules/adhoc_commands.py - gajim/common/protocol/bytestream.py - gajim/common/socks5.py - gajim/common/zeroconf/zeroconf.py - gajim/dev/ipython_view.py - gajim/dialogs.py - gajim/gtk/account_wizard.py - gajim/gtk/dialogs.py - gajim/gtk/discovery.py - gajim/gtk/features.py - gajim/gui_menu_builder.py - gajim/message_control.py - gajim/plugins/helpers.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -14,7 +14,7 @@ run-tests: - . ./civenv/bin/activate - pip3 install mypy - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git@master - - pip3 install pylint==2.1.1 + - pip3 install pylint==2.3.1 - mypy gajim - scripts/dev/pylint-ci.sh --jobs=2 gajim - python3 setup.py test -s test.no_gui ===================================== gajim/chat_control_base.py ===================================== @@ -131,7 +131,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ Derived types SHOULD implement this """ - pass def update_ui(self): """ @@ -149,13 +148,11 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ Derived types MAY implement this """ - pass def _update_toolbar(self): """ Derived types MAY implement this """ - pass def _nec_our_status(self, obj): if self.account != obj.conn.name: @@ -698,7 +695,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): """ Derived types SHOULD implement this """ - pass def _on_drag_leave(self, *args): # FIXME: DND on non editable TextView, find a better way @@ -840,7 +836,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): history = self.received_history pos = self.received_history_pos size = len(history) - scroll = False if pos == size else True # are we scrolling? + scroll = pos != size # we don't want size of the buffer to grow indefinitely max_size = app.config.get('key_up_lines') for _i in range(size - max_size + 1): ===================================== gajim/command_system/errors.py ===================================== @@ -38,16 +38,13 @@ class DefinitionError(BaseError): """ Used to indicate errors occurred on command definition. """ - pass class CommandError(BaseError): """ Used to indicate errors occurred during command execution. """ - pass class NoCommandError(BaseError): """ Used to indicate an inability to find the specified command. """ - pass ===================================== gajim/command_system/framework.py ===================================== @@ -114,14 +114,12 @@ class CommandProcessor: If returns True then command execution will be interrupted and command will not be executed. """ - pass def command_postprocessor(self, cmd, name, arguments, args, kwargs, value): """ Redefine this method in the subclass to execute custom code after command gets executed. """ - pass def looks_like_command(self, text, body, name, arguments): """ @@ -132,7 +130,6 @@ class CommandProcessor: be interrupted and that value will be used to return from process_as_command. """ - pass def get_command(self, name): cmd = get_command(self.COMMAND_HOST, name) ===================================== gajim/common/app.py ===================================== @@ -234,14 +234,14 @@ def detect_dependencies(): # ZEROCONF try: - import pybonjour # pylint: disable=unused-variable + import pybonjour # pylint: disable=unused-import _dependencies['PYBONJOUR'] = True except Exception: pass try: gi.require_version('Avahi', '0.6') - from gi.repository import Avahi # pylint: disable=unused-variable + from gi.repository import Avahi # pylint: disable=unused-import _dependencies['AVAHI'] = True except Exception: pass @@ -305,7 +305,7 @@ def detect_dependencies(): # GEOCLUE try: gi.require_version('Geoclue', '2.0') - from gi.repository import Geoclue # pylint: disable=unused-variable + from gi.repository import Geoclue # pylint: disable=unused-import _dependencies['GEOCLUE'] = True except (ImportError, ValueError): pass @@ -322,7 +322,7 @@ def detect_dependencies(): # PYCURL try: - import pycurl # pylint: disable=unused-variable + import pycurl # pylint: disable=unused-import _dependencies['PYCURL'] = True except ImportError: pass ===================================== gajim/common/events.py ===================================== @@ -261,8 +261,7 @@ class Events: self._events[account][jid].remove(event) self.fire_event_removed([event]) return - else: - return True + return True if types: new_list = [] # list of events to keep removed_list = [] # list of removed events ===================================== gajim/common/exceptions.py ===================================== @@ -97,13 +97,11 @@ class NegotiationError(Exception): """ A session negotiation failed """ - pass class Cancelled(Exception): """ The user cancelled an operation """ - pass class LatexError(Exception): """ ===================================== gajim/common/fuzzyclock.py ===================================== @@ -90,8 +90,6 @@ class FuzzyClock: '0': self.HOUR_NAMES[now.tm_hour % 12], '1': self.HOUR_NAMES[(now.tm_hour + 1) % 12]} - elif fuzzyness == 3: + if fuzzyness == 3: return self.FUZZY_DAYTIME[int(round(now.tm_hour / 3.0))] - - else: - return self.FUZZY_WEEK[now.tm_wday] + return self.FUZZY_WEEK[now.tm_wday] ===================================== gajim/common/jingle_ft.py ===================================== @@ -307,8 +307,7 @@ class JingleFileTransfer(JingleContent): self.__state_changed(State.CAND_SENT_AND_RECEIVED, args) self.__state_changed(State.TRANSFERING) raise nbxmpp.NodeProcessed - else: - self.__state_changed(State.CAND_RECEIVED, args) + self.__state_changed(State.CAND_RECEIVED, args) def __on_iq_result(self, stanza, content, error, action): log.info("__on_iq_result") ===================================== gajim/common/jingle_session.py ===================================== @@ -593,9 +593,9 @@ class JingleSession: text = 'Content %s (created by %s) does not exist' % (name, creator) self.__send_error(stanza, 'bad-request', text=text, type_='_modify') raise nbxmpp.NodeProcessed - else: - cn = self.contents[(creator, name)] - cn.on_stanza(stanza, content, error, action) + + cn = self.contents[(creator, name)] + cn.on_stanza(stanza, content, error, action) def __on_session_terminate(self, stanza, jingle, error, action): self.connection.delete_jingle_session(self.sid) ===================================== gajim/common/jingle_transport.py ===================================== @@ -74,7 +74,6 @@ class JingleTransport: """ Build a candidate stanza for the given candidate """ - pass def make_transport(self, candidates=None): """ ===================================== gajim/common/modules/adhoc_commands.py ===================================== @@ -438,44 +438,44 @@ class AdHocCommands(BaseModule): self._sessions[(jid, sessionid, node)] = obj self._log.info('Comand %s executed: %s', node, jid) raise nbxmpp.NodeProcessed - else: - # the command is already running, check for it - magictuple = (jid, sessionid, node) - if magictuple not in self._sessions: - # we don't have this session... ha! - self._log.warning('Invalid session %s', magictuple) - raise nbxmpp.NodeProcessed - action = cmd.getAttr('action') - obj = self._sessions[magictuple] - - try: - if action == 'cancel': - rc = obj.cancel(stanza) - elif action == 'prev': - rc = obj.prev(stanza) - elif action == 'next': - rc = obj.next(stanza) - elif action == 'execute' or action is None: - rc = obj.execute(stanza) - elif action == 'complete': - rc = obj.complete(stanza) - else: - # action is wrong. stop the session, send error - raise AttributeError - except AttributeError: - # the command probably doesn't handle invoked action... - # stop the session, return error - del self._sessions[magictuple] - self._log.warning('Wrong action %s %s', node, jid) - raise nbxmpp.NodeProcessed + # the command is already running, check for it + magictuple = (jid, sessionid, node) + if magictuple not in self._sessions: + # we don't have this session... ha! + self._log.warning('Invalid session %s', magictuple) + raise nbxmpp.NodeProcessed - # delete the session if rc is False - if not rc: - del self._sessions[magictuple] + action = cmd.getAttr('action') + obj = self._sessions[magictuple] + try: + if action == 'cancel': + rc = obj.cancel(stanza) + elif action == 'prev': + rc = obj.prev(stanza) + elif action == 'next': + rc = obj.next(stanza) + elif action == 'execute' or action is None: + rc = obj.execute(stanza) + elif action == 'complete': + rc = obj.complete(stanza) + else: + # action is wrong. stop the session, send error + raise AttributeError + except AttributeError: + # the command probably doesn't handle invoked action... + # stop the session, return error + del self._sessions[magictuple] + self._log.warning('Wrong action %s %s', node, jid) raise nbxmpp.NodeProcessed + # delete the session if rc is False + if not rc: + del self._sessions[magictuple] + + raise nbxmpp.NodeProcessed + def send_command(self, jid, node, session_id, form, action='execute'): """ ===================================== gajim/common/protocol/bytestream.py ===================================== @@ -757,11 +757,10 @@ class ConnectionSocks5Bytestream(ConnectionBytestream): app.socks5queue.on_success[file_props.sid] = self._proxy_auth_ok raise nbxmpp.NodeProcessed + if file_props.stopped: + self.remove_transfer(file_props) else: - if file_props.stopped: - self.remove_transfer(file_props) - else: - app.socks5queue.send_file(file_props, self.name, 'server') + app.socks5queue.send_file(file_props, self.name, 'server') raise nbxmpp.NodeProcessed ===================================== gajim/common/socks5.py ===================================== @@ -712,10 +712,10 @@ class Socks5: return None self.file_props.stalled = False return lenn - else: - self.state = 8 # end connection - self.disconnect() - return -1 + + self.state = 8 # end connection + self.disconnect() + return -1 def _on_send_exception(self): # peer stopped reading ===================================== gajim/common/zeroconf/zeroconf.py ===================================== @@ -40,14 +40,14 @@ def test_avahi(): try: import gi gi.require_version('Avahi', '0.6') - from gi.repository import Avahi # pylint: disable=unused-variable + from gi.repository import Avahi # pylint: disable=unused-import except (ImportError, ValueError): return False return True def test_bonjour(): try: - import pybonjour # pylint: disable=unused-variable + import pybonjour # pylint: disable=unused-import except ImportError: return False except WindowsError: # pylint: disable=undefined-variable ===================================== gajim/dev/ipython_view.py ===================================== @@ -585,7 +585,6 @@ class ConsoleView(Gtk.TextView): """ For some reason we can't extend onKeyPress directly (bug #500900) """ - pass class IPythonView(ConsoleView, IterableIPShell): ''' ===================================== gajim/dialogs.py ===================================== @@ -574,7 +574,6 @@ class TimeoutDialog: """ To be implemented in derivated classes """ - pass def countdown(self): if self.countdown_enabled: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -200,7 +200,7 @@ class AccountCreationWizard: self.back_button.set_sensitive(True) return - elif cur_page == 1: + if cur_page == 1: # We are adding an existing account anonymous = self.xml.get_object('anonymous_checkbutton1').\ get_active() ===================================== gajim/gtk/dialogs.py ===================================== @@ -649,7 +649,6 @@ class InputDialog(CommonInputDialog): ''' may be implemented by subclasses ''' - pass def set_entry(self, value): self.input_entry.set_text(value) ===================================== gajim/gtk/discovery.py ===================================== @@ -908,7 +908,6 @@ class AgentBrowser: """ Called when the default theme is changed """ - pass def on_browse_button_clicked(self, widget=None): """ @@ -1095,7 +1094,6 @@ class AgentBrowser: def _update_error(self, iter_, jid, node): '''Called when a disco#info query failed for an item.''' - pass class ToplevelAgentBrowser(AgentBrowser): ===================================== gajim/gtk/features.py ===================================== @@ -158,7 +158,7 @@ class FeaturesDialog(Gtk.Dialog): return True try: gi.require_version('Secret', '1') - from gi.repository import Secret # pylint: disable=unused-variable + from gi.repository import Secret # pylint: disable=unused-import except (ValueError, ImportError): return False return True ===================================== gajim/gui_menu_builder.py ===================================== @@ -42,10 +42,10 @@ def build_resources_submenu(contacts, account, action, room_jid=None, item = Gtk.MenuItem.new_with_label( '%s (%s)' % (c.resource, str(c.priority))) sub_menu.append(item) - if action == roster.on_invite_to_room: + if action == roster.on_invite_to_room: # pylint: disable=comparison-with-callable item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) - elif action == roster.on_invite_to_new_room: + elif action == roster.on_invite_to_new_room: # pylint: disable=comparison-with-callable item.connect('activate', action, [(c, account)], c.resource) else: # start_chat, execute_command, send_file item.connect('activate', action, c, account, c.resource) ===================================== gajim/message_control.py ===================================== @@ -78,8 +78,9 @@ class MessageControl: """ Called when the control becomes active (state is True) or inactive (state is False) + + Derived classes MUST implement this method """ - pass # Derived classes MUST implement this method def minimizable(self): """ @@ -121,31 +122,26 @@ class MessageControl: """ Derived classes SHOULD implement this """ - pass def update_ui(self): """ Derived classes SHOULD implement this """ - pass def toggle_emoticons(self): """ Derived classes MAY implement this """ - pass def update_font(self): """ Derived classes SHOULD implement this """ - pass def update_tags(self): """ Derived classes SHOULD implement this """ - pass def get_tab_label(self, chatstate): """ @@ -157,7 +153,6 @@ class MessageControl: """ # Return a markup'd label and optional Gtk.Color in a tuple like: # return (label_str, None) - pass def get_tab_image(self, count_unread=True): # Return a suitable tab image for display. ===================================== gajim/plugins/helpers.py ===================================== @@ -42,7 +42,6 @@ class GajimPluginActivateException(Exception): ''' Raised when activation failed ''' - pass class log_calls: ''' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/45ac229fb13af7bf3cb9e20a0975ed734… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/45ac229fb13af7bf3cb9e20a0975ed734… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix pylint errors
by Philipp Hörist 07 Apr '19

07 Apr '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 45ac229f by Philipp Hörist at 2019-04-07T15:35:19Z Fix pylint errors - - - - - 1 changed file: - gajim/gtk/adhoc.py Changes: ===================================== gajim/gtk/adhoc.py ===================================== @@ -96,7 +96,7 @@ class AdHocCommand(Gtk.Assistant): commands = Gtk.Button(label=_('Commands')) commands.connect('clicked', - lambda *args: self.set_current_page(Page.COMMANDS)) + lambda *args: self.set_current_page(Page.COMMANDS)) self._buttons['commands'] = commands self.add_action_widget(commands) @@ -280,10 +280,11 @@ class Commands(Gtk.Box): self.pack_start(self._scrolled, True, True, 0) self.show_all() - def _search_func(self, model, column, search_text, iter_): + @staticmethod + def _search_func(model, _column, search_text, iter_): return search_text.lower() not in model[iter_][0].lower() - def _on_row_activate(self, tree_view, path, column): + def _on_row_activate(self, _tree_view, _path, _column): self.get_toplevel().execute_action() def add_commands(self, commands): View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45ac229fb13af7bf3cb9e20a0975ed7348… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/45ac229fb13af7bf3cb9e20a0975ed7348… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits