Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 4 commits: Add __init__.py to gajim/dev
by Philipp Hörist 21 Sep '18

21 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: b70549dd by Philipp Hörist at 2018-09-21T21:53:16Z Add __init__.py to gajim/dev - - - - - d722a855 by Philipp Hörist at 2018-09-21T21:53:50Z Fix pylint errors in ipython_view - - - - - 6b2aa24d by Philipp Hörist at 2018-09-21T21:55:57Z Fix rest of mypy errors - This allows us to run mypy on the full gajim folder - - - - - 0f730d19 by Philipp Hörist at 2018-09-21T21:56:56Z Update CI - Run mypy on the full gajim folder - - - - - 24 changed files: - .gitlab-ci.yml - gajim/atom_window.py - gajim/chat_control.py - gajim/common/app.py - gajim/common/config.py - gajim/common/const.py - gajim/common/file_props.py - gajim/common/jingle_content.py - gajim/common/jingle_transport.py - gajim/common/passwords.py - gajim/common/pep.py - gajim/common/rst_xhtml_generator.py - gajim/common/socks5.py - gajim/common/types.py - gajim/common/zeroconf/client_zeroconf.py - gajim/common/zeroconf/zeroconf.py - + gajim/dev/__init__.py - gajim/dev/ipython_view.py - gajim/dialogs.py - gajim/gtk/single_message.py - gajim/gtkgui_helpers.py - gajim/roster_window.py - mypy.ini - scripts/dev/pre-push-tests.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -14,7 +14,7 @@ run-test: run-mypy: stage: test script: - - mypy -p gajim.common.modules --follow-imports=skip + - mypy gajim run-pylint: stage: test ===================================== gajim/atom_window.py ===================================== @@ -17,6 +17,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import List # pylint: disable=unused-import +from typing import Any # pylint: disable=unused-import + from gi.repository import Gdk from gi.repository import GLib @@ -26,7 +29,7 @@ from gajim.common import i18n class AtomWindow: window = None - entries = [] + entries = [] # type: List[Any] @classmethod def newAtomEntry(cls, entry): ===================================== gajim/chat_control.py ===================================== @@ -23,12 +23,21 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import ClassVar # pylint: disable=unused-import +from typing import Type # pylint: disable=unused-import + import os import time + from gi.repository import Gtk from gi.repository import Gio from gi.repository import Pango from gi.repository import GLib +from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC +from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO +from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 +from nbxmpp.protocol import NS_CHATSTATES + from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import message_control @@ -41,14 +50,11 @@ from gajim.common import helpers from gajim.common import ged from gajim.common import i18n from gajim.common.contacts import GC_Contact -from nbxmpp.protocol import NS_XHTML, NS_XHTML_IM, NS_FILE, NS_MUC -from nbxmpp.protocol import NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO -from nbxmpp.protocol import NS_JINGLE_ICE_UDP, NS_JINGLE_FILE_TRANSFER_5 -from nbxmpp.protocol import NS_CHATSTATES from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.const import AvatarSize, KindConstant from gajim.command_system.implementation.hosts import ChatCommands +from gajim.command_system.framework import CommandHost # pylint: disable=unused-import from gajim.chat_control_base import ChatControlBase ################################################################################ @@ -69,7 +75,7 @@ class ChatControl(ChatControlBase): # Set a command host to bound to. Every command given through a chat will be # processed with this command host. - COMMAND_HOST = ChatCommands + COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] def __init__(self, parent_win, contact, acct, session, resource=None): ChatControlBase.__init__(self, self.TYPE_ID, parent_win, ===================================== gajim/common/app.py ===================================== @@ -24,8 +24,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import from typing import Dict # pylint: disable=unused-import from typing import List # pylint: disable=unused-import +from typing import Optional # pylint: disable=unused-import +from typing import cast import os import sys @@ -44,21 +47,25 @@ from gajim.common import ged as ged_module from gajim.common.contacts import LegacyContactsAPI from gajim.common.events import Events from gajim.common.css_config import CSSConfig +from gajim.common.types import NetworkEventsControllerT # pylint: disable=unused-import +from gajim.common.types import InterfaceT # pylint: disable=unused-import +from gajim.common.types import LoggerT # pylint: disable=unused-import +from gajim.common.types import ConnectionT # pylint: disable=unused-import -interface = None # type: gajim.interface.Interface +interface = cast(InterfaceT, None) thread_interface = lambda *args: None # Interface to run a thread and then a callback config = c_config.Config() version = gajim.__version__ -connections = {} # 'account name': 'account (connection.Connection) instance' -avatar_cache = {} +connections = {} # type: Dict[str, ConnectionT] +avatar_cache = {} # type: Dict[str, Dict[str, Any]] ipython_window = None app = None # Gtk.Application ged = ged_module.GlobalEventsDispatcher() # Global Events Dispatcher -nec = None # type: gajim.common.nec.NetworkEventsController +nec = cast(NetworkEventsControllerT, None) plugin_manager = None # Plugins Manager -logger = None # type: gajim.common.logger.Logger +logger = cast(LoggerT, None) # For backwards compatibility needed # some plugins use that @@ -113,7 +120,7 @@ nicks = {} # type: Dict[str, str] # to something else than offline # can also contain account/transport_jid to block notifications for contacts # from this transport -block_signed_in_notifications = {} +block_signed_in_notifications = {} # type: Dict[str, bool] # type of each connection (ssl, tls, tcp, ...) con_types = {} # type: Dict[str, Optional[str]] @@ -153,10 +160,10 @@ gajim_common_features = [nbxmpp.NS_BYTESTREAM, nbxmpp.NS_SI, nbxmpp.NS_FILE, nbxmpp.NS_EME, 'urn:xmpp:avatar:metadata+notify'] # Optional features gajim supports per account -gajim_optional_features = {} +gajim_optional_features = {} # type: Dict[str, List[str]] # Capabilities hash per account -caps_hash = {} +caps_hash = {} # type: Dict[str, List[str]] _dependencies = { 'PYTHON-DBUS': False, ===================================== gajim/common/config.py ===================================== @@ -27,6 +27,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import +from typing import Tuple # pylint: disable=unused-import + import re from enum import IntEnum, unique @@ -287,7 +292,7 @@ class Config: 'use_keyring': [opt_bool, True, _('If true, Gajim will use the Systems Keyring to store account passwords.')], 'pgp_encoding': [opt_str, '', _('Sets the encoding used by python-gnupg'), True], 'remote_commands': [opt_bool, False, _('If true, Gajim will execute XEP-0146 Commands.')], - }, {}) + }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { 'accounts': ({ @@ -436,7 +441,7 @@ class Config: 'plugins': ({ 'active': [opt_bool, False, _('State whether plugins should be activated on startup (this is saved on Gajim exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI instead.')], }, {}), - } + } # type: Dict[str, Tuple[Dict[str, List[Any]], Dict[Any, Any]]] statusmsg_default = { _('Sleeping'): ['ZZZZzzzzzZZZZZ', 'inactive', 'sleeping', '', 'sleepy', ''], ===================================== gajim/common/const.py ===================================== @@ -4,10 +4,10 @@ from collections import namedtuple from gajim.common.i18n import _ Option = namedtuple('Option', 'kind label type value name callback data desc enabledif props') -Option.__new__.__defaults__ = (None,) * len(Option._fields) +Option.__new__.__defaults__ = (None,) * len(Option._fields) # type: ignore DialogButton = namedtuple('DialogButton', 'text callback action') -DialogButton.__new__.__defaults__ = (None, None) +DialogButton.__new__.__defaults__ = (None, None) # type: ignore @unique ===================================== gajim/common/file_props.py ===================================== @@ -17,8 +17,14 @@ Exception: this class should not be instatiated True """ +from typing import Any # pylint: disable=unused-import +from typing import ClassVar # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import +from typing import Tuple # pylint: disable=unused-import + + class FilesProp: - _files_props = {} + _files_props = {} # type: ClassVar[Dict[Tuple[str, str], Any]] def __init__(self): raise Exception('this class should not be instantiated') ===================================== gajim/common/jingle_content.py ===================================== @@ -16,14 +16,19 @@ Handles Jingle contents (XEP 0166) """ +from typing import Any # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import + import os + +import nbxmpp + from gajim.common import app from gajim.common import configpaths -import nbxmpp from gajim.common.jingle_xtls import SELF_SIGNED_CERTIFICATE from gajim.common.jingle_xtls import load_cert_file -contents = {} +contents = {} # type: Dict[str, Any] def get_jingle_content(node): namespace = node.getNamespace() ===================================== gajim/common/jingle_transport.py ===================================== @@ -16,16 +16,21 @@ Handles Jingle Transports (currently only ICE-UDP) """ +from typing import Any # pylint: disable=unused-import +from typing import Dict # pylint: disable=unused-import + import logging import socket from enum import IntEnum, unique + import nbxmpp + from gajim.common import app log = logging.getLogger('gajim.c.jingle_transport') -transports = {} +transports = {} # type: Dict[str, Any] def get_jingle_transport(node): namespace = node.getNamespace() ===================================== gajim/common/passwords.py ===================================== @@ -28,10 +28,12 @@ __all__ = ['get_password', 'save_password'] log = logging.getLogger('gajim.password') -keyring = None + try: import keyring + KEYRING_AVAILABLE = True except ImportError: + KEYRING_AVAILABLE = False log.debug('python-keyring missing, falling back to plaintext storage') @@ -83,7 +85,7 @@ class PasswordStorageManager(PasswordStorage): """ # TODO: handle disappearing backends - if app.config.get('use_keyring') and keyring: + if app.config.get('use_keyring') and KEYRING_AVAILABLE: self.secret = SecretPasswordStorage() def get_password(self, account_name): ===================================== gajim/common/pep.py ===================================== @@ -19,11 +19,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import + import logging -log = logging.getLogger('gajim.c.pep') from gajim.common import app +log = logging.getLogger('gajim.c.pep') class AbstractPEP: @@ -75,4 +78,4 @@ class AbstractPEP: pass -SUPPORTED_PERSONAL_USER_EVENTS = [] +SUPPORTED_PERSONAL_USER_EVENTS = [] # type: List[Any] ===================================== gajim/common/rst_xhtml_generator.py ===================================== @@ -18,11 +18,11 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. try: - from docutils import io + from docutils import io # type: ignore from docutils.core import Publisher from docutils.parsers.rst import roles - from docutils import nodes, utils - from docutils.parsers.rst.roles import set_classes + from docutils import nodes, utils # type: ignore + from docutils.parsers.rst.roles import set_classes # type: ignore except ImportError: print("Requires docutils 0.4 for set_classes to be available") def create_xhtml(text): ===================================== gajim/common/socks5.py ===================================== @@ -799,7 +799,7 @@ class Socks5: return self.file_props.received_len return None - def disconnect(self): + def disconnect(self, *args, **kwargs): """ Close open descriptors and remover socket descr. from idleque """ ===================================== gajim/common/types.py ===================================== @@ -33,6 +33,15 @@ if TYPE_CHECKING: from gajim.common.contacts import Contact from gajim.common.contacts import GC_Contact from gajim.common.nec import NetworkEvent + from gajim.common.nec import NetworkEventsController + from gajim.common.logger import Logger + + from gajim.gui_interface import Interface + + +NetworkEventsControllerT = Union['NetworkEventsController'] +InterfaceT = Union['Interface'] +LoggerT = Union['Logger'] ConnectionT = Union['Connection', 'ConnectionZeroconf'] ContactT = Union['Contact', 'GC_Contact'] ===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== @@ -19,6 +19,7 @@ from gajim.common import app import nbxmpp from nbxmpp.idlequeue import IdleObject from nbxmpp import dispatcher_nb, simplexml +from nbxmpp.plugin import PlugIn from nbxmpp.plugin import * from nbxmpp.transports_nb import DATA_RECEIVED, DATA_SENT, DATA_ERROR from gajim.common.zeroconf import zeroconf ===================================== gajim/common/zeroconf/zeroconf.py ===================================== @@ -14,8 +14,11 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any # pylint: disable=unused-import + from enum import IntEnum, unique + @unique class Constant(IntEnum): NAME = 0 @@ -54,7 +57,7 @@ def test_zeroconf(): if test_avahi(): from gajim.common.zeroconf import zeroconf_avahi - Zeroconf = zeroconf_avahi.Zeroconf + Zeroconf = zeroconf_avahi.Zeroconf # type: Any elif test_bonjour(): from gajim.common.zeroconf import zeroconf_bonjour Zeroconf = zeroconf_bonjour.Zeroconf ===================================== gajim/dev/__init__.py ===================================== ===================================== gajim/dev/ipython_view.py ===================================== @@ -40,17 +40,17 @@ available under the terms of the BSD which accompanies this distribution, and is available at U{http://www.opensource.org/licenses/bsd-license.php} """ +import re +import sys +import os +from io import StringIO from functools import reduce from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GObject from gi.repository import GLib -import re -import sys -import os from gi.repository import Pango -from io import StringIO try: import IPython @@ -92,8 +92,8 @@ class IterableIPShell: @ivar complete_sep: Seperation delimeters for completion function. @type complete_sep: _sre.SRE_Pattern """ - def __init__(self,argv=[],user_ns=None,user_global_ns=None, cin=None, - cout=None,cerr=None, input_func=None): + def __init__(self, argv=None, user_ns=None, user_global_ns=None, cin=None, + cout=None, cerr=None, input_func=None): """ @param argv: Command line options for IPython @type argv: list @@ -110,6 +110,9 @@ class IterableIPShell: @param input_func: Replacement for builtin raw_input() @type input_func: function """ + if argv is None: + argv = [] + io = IPython.utils.io if input_func: if IPython.version_info[0] >= 1: @@ -161,9 +164,9 @@ class IterableIPShell: sys.excepthook = excepthook self.iter_more = 0 self.history_level = 0 - self.complete_sep = re.compile('[\s\{\}\[\]]') - self.updateNamespace({'exit':lambda:None}) - self.updateNamespace({'quit':lambda:None}) + self.complete_sep = re.compile(r'[\s\{\}\[\]]') + self.updateNamespace({'exit':lambda: None}) + self.updateNamespace({'quit':lambda: None}) #self.IP.readline_startup_hook(self.IP.pre_readline) # Workaround for updating namespace with sys.modules # @@ -173,7 +176,7 @@ class IterableIPShell: ''' Update self.IP namespace for autocompletion with sys.modules ''' - for k,v in sys.modules.items(): + for k, v in sys.modules.items(): if not '.' in k: self.IP.user_ns.update({k:v}) @@ -315,7 +318,7 @@ class IterableIPShell: possibilities = self.IP.complete(split_line[-1]) else: completed = line - possibilities = ['',[]] + possibilities = ['', []] if possibilities: def _commonPrefix(str1, str2): ''' @@ -361,14 +364,14 @@ class ConsoleView(Gtk.TextView): @type line_start: Gtk.TextMark """ - ANSI_COLORS = {'0;30': 'Black', '0;31': 'Red', - '0;32': 'Green', '0;33': 'Brown', - '0;34': 'Blue', '0;35': 'Purple', - '0;36': 'Cyan', '0;37': 'LightGray', - '1;30': 'DarkGray', '1;31': 'DarkRed', - '1;32': 'SeaGreen', '1;33': 'Yellow', - '1;34': 'LightBlue', '1;35': 'MediumPurple', - '1;36': 'LightCyan', '1;37': 'White'} + ANSI_COLORS = {'0;30': 'Black', '0;31': 'Red', + '0;32': 'Green', '0;33': 'Brown', + '0;34': 'Blue', '0;35': 'Purple', + '0;36': 'Cyan', '0;37': 'LightGray', + '1;30': 'DarkGray', '1;31': 'DarkRed', + '1;32': 'SeaGreen', '1;33': 'Yellow', + '1;34': 'LightBlue', '1;35': 'MediumPurple', + '1;36': 'LightCyan', '1;37': 'White'} def __init__(self): """ @@ -387,7 +390,7 @@ class ConsoleView(Gtk.TextView): weight=700) self.text_buffer.create_tag('0') self.text_buffer.create_tag('notouch', editable=False) - self.color_pat = re.compile('\x01?\x1b\[(.*?)m\x02?') + self.color_pat = re.compile(r'\x01?\x1b\[(.*?)m\x02?') if HAS_IPYTHON5: self.style_dict = { Token.Prompt: '0;32', @@ -401,7 +404,7 @@ class ConsoleView(Gtk.TextView): self.connect('key-press-event', self.onKeyPress) def write(self, text, editable=False): - if type(text) == str: + if isinstance(text, str): GLib.idle_add(self._write, text, editable) elif IPython.version_info[0] >= 5: GLib.idle_add(self._write5, text, editable) @@ -422,7 +425,7 @@ class ConsoleView(Gtk.TextView): for token, segment in text: tag = self.style_dict[token] self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segment, tag) + segment, tag) if not editable: self.text_buffer.apply_tag_by_name('notouch', self.text_buffer.get_iter_at_mark(start_mark), @@ -439,7 +442,7 @@ class ConsoleView(Gtk.TextView): @param editable: If true, added text is editable. @type editable: boolean """ - if type(text) == list and IPython.version_info[0] >= 5: + if isinstance(text, list) and IPython.version_info[0] >= 5: self._write5(text, editable) return segments = self.color_pat.split(text) @@ -454,7 +457,7 @@ class ConsoleView(Gtk.TextView): for tag in ansi_tags: i = segments.index(tag) self.text_buffer.insert_with_tags_by_name(self.text_buffer.get_end_iter(), - segments[i+1], str(tag)) + segments[i+1], str(tag)) segments.pop(i) if not editable: self.text_buffer.apply_tag_by_name('notouch', @@ -501,8 +504,8 @@ class ConsoleView(Gtk.TextView): @rtype: string """ rv = self.text_buffer.get_slice( - self.text_buffer.get_iter_at_mark(self.line_start), - self.text_buffer.get_end_iter(), False) + self.text_buffer.get_iter_at_mark(self.line_start), + self.text_buffer.get_end_iter(), False) return rv def showReturned(self, text): @@ -518,9 +521,9 @@ class ConsoleView(Gtk.TextView): iter_ = self.text_buffer.get_iter_at_mark(self.line_start) iter_.forward_to_line_end() self.text_buffer.apply_tag_by_name( - 'notouch', - self.text_buffer.get_iter_at_mark(self.line_start), - iter_) + 'notouch', + self.text_buffer.get_iter_at_mark(self.line_start), + iter_) self._write('\n'+text) if text: self._write('\n') @@ -532,7 +535,7 @@ class ConsoleView(Gtk.TextView): indentation = self.IP.input_splitter.indent_spaces * ' ' self.text_buffer.insert_at_cursor(indentation) - def onKeyPress(self, widget, event): + def onKeyPress(self, _widget, event): """ Key press callback used for correcting behavior for console-like interfaces. For example 'home' should go to prompt, not to beginning of @@ -555,10 +558,11 @@ class ConsoleView(Gtk.TextView): if event.get_state() == 0: self.text_buffer.place_cursor(start_iter) return True - elif event.get_state() == Gdk.ModifierType.SHIFT_MASK: + if event.get_state() == Gdk.ModifierType.SHIFT_MASK: self.text_buffer.move_mark(insert_mark, start_iter) return True - elif event.keyval == Gdk.KEY_Left: + + if event.keyval == Gdk.KEY_Left: insert_iter.backward_cursor_position() if not insert_iter.editable(True): return True @@ -611,7 +615,7 @@ class IPythonView(ConsoleView, IterableIPShell): # IPython 5.0 calls prompt_for_code instead of raw_input return self.raw_input(self) - def raw_input(self, prompt=''): + def raw_input(self, _prompt=''): """ Custom raw_input() replacement. Get's current line from console buffer @@ -643,16 +647,16 @@ class IPythonView(ConsoleView, IterableIPShell): self.interrupt = True self._processLine() return True - elif event.keyval == Gdk.KEY_Return: + if event.keyval == Gdk.KEY_Return: self._processLine() return True - elif event.keyval == Gdk.KEY_Up: + if event.keyval == Gdk.KEY_Up: self.changeLine(self.historyBack()) return True - elif event.keyval == Gdk.KEY_Down: + if event.keyval == Gdk.KEY_Down: self.changeLine(self.historyForward()) return True - elif event.keyval == Gdk.KEY_Tab: + if event.keyval == Gdk.KEY_Tab: if not self.getCurrentLine().strip(): return False completed, possibilities = self.complete(self.getCurrentLine()) @@ -672,7 +676,8 @@ class IPythonView(ConsoleView, IterableIPShell): self.history_pos = 0 self.execute() rv = self.cout.getvalue() - if rv: rv = rv.strip('\n') + if rv: + rv = rv.strip('\n') self.showReturned(rv) self.cout.truncate(0) self.cout.seek(0) ===================================== gajim/dialogs.py ===================================== @@ -25,18 +25,22 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GLib +from typing import Dict # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import +from typing import Tuple # pylint: disable=unused-import import os import logging +from random import randrange + +from gi.repository import Gtk +from gi.repository import Gdk +from gi.repository import GLib from gajim import gtkgui_helpers from gajim import vcard from gajim import dataforms_widget -from random import randrange from gajim.common import ged from gajim.common.i18n import _ from gajim.common.const import ACTIVITIES @@ -1363,7 +1367,7 @@ class ProgressDialog: class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them - instances = [] + instances = [] # type: List[TransformChatToMUC] def __init__(self, account, jids, preselected=None): """ This window is used to trasform a one-to-one chat to a MUC. We do 2 @@ -1584,7 +1588,7 @@ class ResourceConflictDialog(TimeoutDialog, InputDialog): class VoIPCallReceivedDialog: - instances = {} + instances = {} # type: Dict[Tuple[str, str], VoIPCallReceivedDialog] def __init__(self, account, contact_jid, sid, content_types): self.instances[(contact_jid, sid)] = self self.account = account ===================================== gajim/gtk/single_message.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import List # pylint: disable=unused-import + from gi.repository import Gdk from gi.repository import GLib @@ -40,7 +42,7 @@ class SingleMessageWindow: action argument which can be 'send' or 'receive' """ # Keep a reference on windows so garbage collector don't restroy them - instances = [] + instances = [] # type: List[SingleMessageWindow] def __init__(self, account, to='', action='', from_whom='', subject='', message='', resource='', session=None, form_node=None): self.instances.append(self) ===================================== gajim/gtkgui_helpers.py ===================================== @@ -23,32 +23,34 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import cairo +import os +import sys +import math +import logging +from io import BytesIO +import xml.etree.ElementTree as ET import xml.sax.saxutils +from xml.sax import ContentHandler # type: ignore + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Pango -import cairo -import os -import sys -import math -import xml.etree.ElementTree as ET try: from PIL import Image except Exception: pass -from io import BytesIO - -import logging -log = logging.getLogger('gajim.gtkgui_helpers') from gajim.common import i18n from gajim.common import app from gajim.common import configpaths from gajim.common.const import PEPEventType, ACTIVITIES, MOODS +log = logging.getLogger('gajim.gtkgui_helpers') + gtk_icon_theme = Gtk.IconTheme.get_default() gtk_icon_theme.append_search_path(configpaths.get('ICONS')) @@ -234,9 +236,9 @@ def scroll_to_end(widget): return False -class ServersXMLHandler(xml.sax.ContentHandler): +class ServersXMLHandler(ContentHandler): def __init__(self): - xml.sax.ContentHandler.__init__(self) + ContentHandler.__init__(self) self.servers = [] def startElement(self, name, attributes): ===================================== gajim/roster_window.py ===================================== @@ -5643,7 +5643,7 @@ class RosterWindow: ### ################################################################################ - def __init__(self, application: Gtk.Application): + def __init__(self, application): self.application = application self.filtering = False self.starting = False ===================================== mypy.ini ===================================== @@ -1,5 +1,6 @@ [mypy] python_version = 3.5 +warn_unused_configs = True disallow_incomplete_defs = True [mypy-nbxmpp.*] @@ -61,3 +62,12 @@ ignore_missing_imports = True [mypy-docutils.*] ignore_missing_imports = True + +[mypy-IPython.*] +ignore_missing_imports = True + +[mypy-traitlets.*] +ignore_missing_imports = True + +[mypy-pygments.*] +ignore_missing_imports = True \ No newline at end of file ===================================== scripts/dev/pre-push-tests.sh ===================================== @@ -1,4 +1,4 @@ -mypy -p gajim.common.modules --follow-imports=skip +mypy gajim pylint --jobs=2 --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,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim # C0103 invalid-name View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/74b66837fa00dd9a196f3aaa0dc2fbfc6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/74b66837fa00dd9a196f3aaa0dc2fbfc6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 5 commits: Move HtmlTextView test into test folder
by Philipp Hörist 21 Sep '18

21 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5a906c14 by Philipp Hörist at 2018-09-21T13:46:52Z Move HtmlTextView test into test folder - - - - - 3f2f51c1 by Philipp Hörist at 2018-09-21T13:46:52Z Add license header to emoji_data.py - - - - - 4d4d0023 by Philipp Hörist at 2018-09-21T13:46:52Z Extend stubs for emoji_data - - - - - f7a2ac9d by Philipp Hörist at 2018-09-21T13:46:52Z Add annotations - Add a gtk/types modules - Add a gtk/const module to prevent circular imports - - - - - 74b66837 by Philipp Hörist at 2018-09-21T13:46:52Z Add annotations - Remove some unused vars from app - - - - - 16 changed files: - gajim/accounts_window.py - gajim/common/app.py - gajim/common/types.py - gajim/config.py - gajim/gtk/account_wizard.py - + gajim/gtk/const.py - gajim/gtk/emoji_data.py - gajim/gtk/emoji_data.pyi - gajim/gtk/filechoosers.py - + gajim/gtk/types.py - gajim/gtkexcepthook.py - gajim/gui_interface.py - gajim/htmltextview.py - gajim/plugins/gajimplugin.py - + test/gtk/htmltextview.py - test/lib/gajim_mocks.py Changes: ===================================== gajim/accounts_window.py ===================================== @@ -258,10 +258,8 @@ class AccountsWindow(Gtk.ApplicationWindow): 'accounts', account, 'name') app.block_signed_in_notifications[account] = True app.sleeper_state[account] = 'off' - app.encrypted_chats[account] = [] app.last_message_time[account] = {} app.status_before_autoaway[account] = '' - app.transport_avatar[account] = {} app.gajim_optional_features[account] = [] app.caps_hash[account] = '' helpers.update_optional_features(account) @@ -292,10 +290,8 @@ class AccountsWindow(Gtk.ApplicationWindow): del app.to_be_removed[account] del app.newly_added[account] del app.sleeper_state[account] - del app.encrypted_chats[account] del app.last_message_time[account] del app.status_before_autoaway[account] - del app.transport_avatar[account] del app.gajim_optional_features[account] del app.caps_hash[account] if len(app.connections) >= 2: ===================================== gajim/common/app.py ===================================== @@ -24,6 +24,9 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Dict # pylint: disable=unused-import +from typing import List # pylint: disable=unused-import + import os import sys import logging @@ -68,53 +71,66 @@ css_config = None os_info = None # used to cache os information -transport_type = {} # list the type of transport +transport_type = {} # type: Dict[str, str] -last_message_time = {} # list of time of the latest incoming message - # {acct1: {jid1: time1, jid2: time2}, } -encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..} +# dict of time of the latest incoming message per jid +# {acct1: {jid1: time1, jid2: time2}, } +last_message_time = {} # type: Dict[str, Dict[str, float]] contacts = LegacyContactsAPI() -gc_connected = {} # tell if we are connected to the room or not - # {acct: {room_jid: True}} -gc_passwords = {} # list of the pass required to enter a room - # {room_jid: password} -automatic_rooms = {} # list of rooms that must be automaticaly configured - # and for which we have a list of invities - #{account: {room_jid: {'invities': []}}} - -groups = {} # list of groups -newly_added = {} # list of contacts that has just signed in -to_be_removed = {} # list of contacts that has just signed out + +# tell if we are connected to the room or not +# {acct: {room_jid: True}} +gc_connected = {} # type: Dict[str, Dict[str, bool]] + +# dict of the pass required to enter a room +# {room_jid: password} +gc_passwords = {} # type: Dict[str, str] + +# dict of rooms that must be automaticaly configured +# and for which we have a list of invities +# {account: {room_jid: {'invities': []}}} +automatic_rooms = {} # type: Dict[str, Dict[str, Dict[str, List[str]]]] + + # dict of groups, holds if they are expanded or not +groups = {} # type: Dict[str, Dict[str, Dict[str, bool]]] + +# list of contacts that has just signed in +newly_added = {} # type: Dict[str, List[str]] + +# list of contacts that has just signed out +to_be_removed = {} # type: Dict[str, List[str]] events = Events() notification = None -nicks = {} # list of our nick names in each account +# list of our nick names in each account +nicks = {} # type: Dict[str, str] + # should we block 'contact signed in' notifications for this account? # this is only for the first 30 seconds after we change our show # to something else than offline # can also contain account/transport_jid to block notifications for contacts # from this transport block_signed_in_notifications = {} -con_types = {} # type of each connection (ssl, tls, tcp, ...) -sleeper_state = {} # whether we pass auto away / xa or not + # type of each connection (ssl, tls, tcp, ...) +con_types = {} # type: Dict[str, Optional[str]] + +# whether we pass auto away / xa or not #'off': don't use sleeper for this account #'online': online and use sleeper #'autoaway': autoaway and use sleeper #'autoxa': autoxa and use sleeper -status_before_autoaway = {} +sleeper_state = {} # type: Dict[str, str] -# jid of transport contacts for which we need to ask avatar when transport will -# be online -transport_avatar = {} # {transport_jid: [jid_list]} +status_before_autoaway = {} # type: Dict[str, str] # Is Gnome configured to activate on single click ? single_click = False SHOW_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', - 'invisible', 'error'] + 'invisible', 'error'] # zeroconf account name ZEROCONF_ACC_NAME = 'Local' ===================================== gajim/common/types.py ===================================== @@ -32,6 +32,7 @@ if TYPE_CHECKING: from gajim.common.zeroconf.connection_zeroconf import ConnectionZeroconf from gajim.common.contacts import Contact from gajim.common.contacts import GC_Contact + from gajim.common.nec import NetworkEvent ConnectionT = Union['Connection', 'ConnectionZeroconf'] ContactT = Union['Contact', 'GC_Contact'] @@ -44,3 +45,9 @@ PEPHandlersDict = Dict[str, List[PEPNotifyCallback]] # Configpaths PathTuple = Tuple[Optional[PathLocation], str, Optional[PathType]] + +# Plugins +PluginExtensionPoints = Dict[str, Tuple[Optional[Callable[..., None]], + Optional[Callable[..., None]]]] +EventHandlersDict = Dict[str, Tuple[int, Callable[['NetworkEvent'], Optional[bool]]]] +PluginEvents = List['NetworkEvent'] ===================================== gajim/config.py ===================================== @@ -674,10 +674,8 @@ class RemoveAccountWindow: del app.to_be_removed[self.account] del app.newly_added[self.account] del app.sleeper_state[self.account] - del app.encrypted_chats[self.account] del app.last_message_time[self.account] del app.status_before_autoaway[self.account] - del app.transport_avatar[self.account] del app.gajim_optional_features[self.account] del app.caps_hash[self.account] if len(app.connections) >= 2: # Do not merge accounts if only one exists ===================================== gajim/gtk/account_wizard.py ===================================== @@ -582,10 +582,8 @@ class AccountCreationWizard: app.nicks[self.account] = config['name'] app.block_signed_in_notifications[self.account] = True app.sleeper_state[self.account] = 'off' - app.encrypted_chats[self.account] = [] app.last_message_time[self.account] = {} app.status_before_autoaway[self.account] = '' - app.transport_avatar[self.account] = {} app.gajim_optional_features[self.account] = [] app.caps_hash[self.account] = '' helpers.update_optional_features(self.account) ===================================== gajim/gtk/const.py ===================================== @@ -0,0 +1,19 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Constants for the gtk module + +from collections import namedtuple + +Filter = namedtuple('Filter', 'name pattern default') ===================================== gajim/gtk/emoji_data.py ===================================== @@ -1,3 +1,17 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + import re import weakref from enum import IntEnum ===================================== gajim/gtk/emoji_data.pyi ===================================== @@ -1 +1,39 @@ -# Needs to be here because mypy get stuck on emoji_data.py +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from enum import IntEnum +from collections import OrderedDict + +from gi.repository import GdkPixbuf + +class Emoji(IntEnum): + ... + +def is_emoji(codepoints: str) -> bool: ... +def get_emoji_pixbuf(codepoints: str) -> GdkPixbuf.Pixbuf: ... + +class EmojiData(OrderedDict): + ... + +class EmojiPixbufs(dict): + ... + +class EmojiAsciiData(dict): + ... + +emoji_pixbufs = EmojiPixbufs() + +emoji_ascii_data = EmojiAsciiData() + +emoji_data = EmojiData() ===================================== gajim/gtk/filechoosers.py ===================================== @@ -18,7 +18,6 @@ import os import sys from pathlib import Path -from collections import namedtuple from gi.repository import Gtk from gi.repository import GdkPixbuf @@ -26,11 +25,11 @@ from gi.repository import GObject from gajim.common import app from gajim.common.i18n import _ +from gajim.gtk.const import Filter +from gajim.gtk.types import FilterList # pylint: disable=unused-import -Filter = namedtuple('Filter', 'name pattern default') - -def _require_native(): +def _require_native() -> bool: if app.is_flatpak(): return True if sys.platform in ('win32', 'darwin'): @@ -85,7 +84,7 @@ class BaseFileChooser: class BaseFileOpenDialog: _title = _('Choose File to Send…') - _filters = [Filter(_('All files'), '*', True)] + _filters = [Filter(_('All files'), '*', True)] # type: FilterList class BaseAvatarChooserDialog: @@ -96,7 +95,7 @@ class BaseAvatarChooserDialog: if _require_native(): _filters = [Filter(_('PNG files'), '*.png', True), Filter(_('JPEG files'), '*.jp*g', False), - Filter(_('SVG files'), '*.svg', False)] + Filter(_('SVG files'), '*.svg', False)] # type: FilterList else: _filters = [Filter(_('Images'), ['image/png', 'image/jpeg', @@ -106,7 +105,7 @@ class BaseAvatarChooserDialog: class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): _title = '' - _filters = [] + _filters = [] # type: FilterList _action = Gtk.FileChooserAction.OPEN def __init__(self, accept_cb, cancel_cb=None, transient_for=None, @@ -161,7 +160,7 @@ class NativeAvatarChooserDialog(BaseAvatarChooserDialog, NativeFileChooserDialog class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): _title = '' - _filters = [] + _filters = [] # type: FilterList _action = Gtk.FileChooserAction.OPEN _preivew_size = (200, 200) ===================================== gajim/gtk/types.py ===================================== @@ -0,0 +1,22 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +# Types for typechecking + +from typing import ClassVar +from typing import List + +from gajim.gtk.const import Filter + +FilterList = ClassVar[List[Filter]] ===================================== gajim/gtkexcepthook.py ===================================== @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import cast + import sys import os import traceback @@ -40,7 +42,8 @@ if __name__ == '__main__': glade_file = os.path.join('data', 'gui', 'exception_dialog.ui') else: from gajim.common import configpaths - glade_file = os.path.join(configpaths.get('GUI'), 'exception_dialog.ui') + gui_path = cast(str, configpaths.get('GUI')) + glade_file = os.path.join(gui_path, 'exception_dialog.ui') _exception_in_progress = threading.Lock() ===================================== gajim/gui_interface.py ===================================== @@ -2714,10 +2714,8 @@ class Interface: app.nicks[a] = app.config.get_per('accounts', a, 'name') app.block_signed_in_notifications[a] = True app.sleeper_state[a] = 0 - app.encrypted_chats[a] = [] app.last_message_time[a] = {} app.status_before_autoaway[a] = '' - app.transport_avatar[a] = {} app.gajim_optional_features[a] = [] app.caps_hash[a] = '' ===================================== gajim/htmltextview.py ===================================== @@ -44,10 +44,6 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf -if __name__ == '__main__': - from gajim.common import configpaths - configpaths.init() - from gajim.common import app from gajim.common import helpers from gajim.common.i18n import _ @@ -1086,185 +1082,3 @@ class HtmlTextView(Gtk.TextView): self.add_child_at_anchor(emoji, anchor) buffer_.delete_mark(start_mark) buffer_.delete_mark(end_mark) - -change_cursor = None - -if __name__ == '__main__': - from gajim.conversation_textview import ConversationTextview - from gajim.gui_interface import Interface - - Interface() - - # create fake app.plugin_manager.gui_extension_point method for tests - def extension_point(*args): - pass - def gui_extension_point(*args): - pass - app.plugin_manager = Interface() - app.plugin_manager.extension_point = extension_point - app.plugin_manager.gui_extension_point = gui_extension_point - - htmlview = ConversationTextview(None) - - def on_textview_motion_notify_event(widget, event): - """ - Change the cursor to a hand when we are over a mail or an url - """ - global change_cursor - w = htmlview.tv.get_window(Gtk.TextWindowType.TEXT) - device = w.get_display().get_device_manager().get_client_pointer() - pointer = w.get_device_position(device) - x = pointer[1] - y = pointer[2] - tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags() - if change_cursor: - w.set_cursor(get_cursor('XTERM')) - change_cursor = None - for tag in tags: - try: - if tag.is_anchor: - w.set_cursor(get_cursor('HAND2')) - change_cursor = tag - except Exception: - pass - - htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) - - def handler(texttag, widget, event, iter_, kind): - if event.type == Gdk.EventType.BUTTON_PRESS: - pass - - htmlview.tv.hyperlink_handler = htmlview.hyperlink_handler - - htmlview.print_real_text(None, xhtml='<div>' - 'Hello \n' - ' <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> \n' - 'World\n' - '</div>\n') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - a:b - <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google - </a> - - </body>''') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - - O - MG, - I'm green - with envy! - - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - http://test.com/ testing links autolinkifying - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - As Emerson said in his essay Self-Reliance: - - "A foolish consistency is the hobgoblin of little minds." - - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - - Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? - - - <img src='http://www.xmpp.org/images/psa-license.jpg' - alt='A License to Jabber' width='50%' height='50%'/> - - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - <ul style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two </li> - <li> Three </li> - </ul><hr /><pre style="background-color:rgb(120,120,120)">def fac(n): -def faciter(n,acc): - if n==0: return acc - return faciter(n-1, acc*n) -if n<0: raise ValueError('Must be non-negative') -return faciter(n,1)</pre> - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - <ol style='background-color:rgb(120,140,100)'> - <li> One </li> - <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> - <li> One </li> - <li style='font-size:50%'> Two </li> - <li style='font-size:200%'> Three </li> - <li style='font-size:9999pt'> Four </li> - </ul></li> - <li> Three </li></ol> - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - - - <a href='xmpp:example@example.org'>xmpp link</a> - : - <div xmlns='http://www.w3.org/1999/xhtml'> - <cite style='margin: 7px;' title='xmpp:examples@example.org'> - - examples(a)example.org wrote: - - this cite - bla bla bla, smile- :-) … - </cite> - <div> - some text - </div> - </div> - - #232/1 - </body> - ''') - htmlview.print_real_text(None, xhtml='<hr />') - htmlview.print_real_text(None, xhtml=''' - <body xmlns='http://www.w3.org/1999/xhtml'> - -<img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ -AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ -ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ -a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ -ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ -F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ -hhx4dbgYKAAA7' alt='Larry'/> - </body> - ''') - htmlview.tv.show() - sw = Gtk.ScrolledWindow() - sw.set_property('hscrollbar-policy', Gtk.PolicyType.AUTOMATIC) - sw.set_property('vscrollbar-policy', Gtk.PolicyType.AUTOMATIC) - sw.set_property('border-width', 0) - sw.add(htmlview.tv) - sw.show() - frame = Gtk.Frame() - frame.set_shadow_type(Gtk.ShadowType.IN) - frame.show() - frame.add(sw) - win = Gtk.Window() - win.add(frame) - win.set_default_size(400, 300) - win.show_all() - win.connect('destroy', lambda win: Gtk.main_quit()) - Gtk.main() ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -21,15 +21,25 @@ Base class for implementing plugin. :license: GPL ''' +from typing import List # pylint: disable=W0611 +from typing import Tuple # pylint: disable=W0611 +from typing import Dict # pylint: disable=W0611 +from typing import Any # pylint: disable=W0611 + import os import locale +import logging +import pickle from gajim.common import configpaths +from gajim.common.types import PluginExtensionPoints # pylint: disable=W0611 +from gajim.common.types import EventHandlersDict # pylint: disable=W0611 +from gajim.common.types import PluginEvents # pylint: disable=W0611 from gajim.plugins.helpers import log_calls, log from gajim.plugins.gui import GajimPluginConfigDialog -import logging + log = logging.getLogger('gajim.p.plugin') @@ -86,7 +96,7 @@ class GajimPlugin: :todo: should be allow rich text here (like HTML or reStructuredText)? ''' - authors = [] + authors = [] # type: List[str] ''' Plugin authors. @@ -104,7 +114,7 @@ class GajimPlugin: :todo: should we check whether provided string is valid URI? (Maybe using 'property') ''' - gui_extension_points = {} + gui_extension_points = {} # type: PluginExtensionPoints ''' Extension points that plugin wants to connect with and handlers to be used. @@ -118,7 +128,7 @@ class GajimPlugin: or when extpoint is destroyed and plugin is activate (eg. chat window closed). ''' - config_default_values = {} + config_default_values = {} # type: Dict[str, Tuple[Any, str]] ''' Default values for keys that should be stored in plug-in config. @@ -132,7 +142,7 @@ class GajimPlugin: :type: {} of 2-element tuples ''' - events_handlers = {} + events_handlers = {} # type: EventHandlersDict ''' Dictionary with events handlers. @@ -143,7 +153,7 @@ class GajimPlugin: :type: {} with 2-element tuples ''' - events = [] + events = [] # type: PluginEvents ''' New network event classes to be registered in Network Events Controller. @@ -152,7 +162,7 @@ class GajimPlugin: ''' @log_calls('GajimPlugin') - def __init__(self): + def __init__(self) -> None: self.config = GajimPluginConfig(self) ''' Plug-in configuration dictionary. @@ -168,11 +178,11 @@ class GajimPlugin: self.init() @log_calls('GajimPlugin') - def save_config(self): + def save_config(self) -> None: self.config.save() @log_calls('GajimPlugin') - def load_config(self): + def load_config(self) -> None: self.config.load() def __eq__(self, plugin): @@ -203,7 +213,6 @@ class GajimPlugin: def deactivate(self): pass -import pickle class GajimPluginConfig(): @log_calls('GajimPluginConfig') ===================================== test/gtk/htmltextview.py ===================================== @@ -0,0 +1,188 @@ +import sys +import os +from unittest.mock import MagicMock + +sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..'))) + +from gi.repository import Gtk, Gdk + +from gajim.common import app +from gajim.common import configpaths +configpaths.init() +from gajim.common import caps_cache + +from gajim.gtk.util import get_cursor +from gajim.conversation_textview import ConversationTextview +from gajim.gui_interface import Interface + + +caps_cache.capscache = MagicMock() +app.plugin_manager = MagicMock() +app.logger = MagicMock() +app.interface = Interface() + +change_cursor = None +htmlview = ConversationTextview(None) + +def on_textview_motion_notify_event(widget, event): + """ + Change the cursor to a hand when we are over a mail or an url + """ + global change_cursor + w = htmlview.tv.get_window(Gtk.TextWindowType.TEXT) + device = w.get_display().get_device_manager().get_client_pointer() + pointer = w.get_device_position(device) + x = pointer[1] + y = pointer[2] + tags = htmlview.tv.get_iter_at_location(x, y)[1].get_tags() + if change_cursor: + w.set_cursor(get_cursor('XTERM')) + change_cursor = None + for tag in tags: + try: + if tag.is_anchor: + w.set_cursor(get_cursor('HAND2')) + change_cursor = tag + except Exception: + pass + +htmlview.tv.connect('motion_notify_event', on_textview_motion_notify_event) + +def handler(texttag, widget, event, iter_, kind): + if event.type == Gdk.EventType.BUTTON_PRESS: + pass + +htmlview.tv.hyperlink_handler = htmlview.hyperlink_handler + +htmlview.print_real_text(None, xhtml='<div>' +'Hello \n' + ' <img src="http://images.slashdot.org/topics/topicsoftware.gif"/> \n' +'World\n' + '</div>\n') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + a:b + <a href='http://google.com/' xmlns='http://www.w3.org/1999/xhtml'>Google + </a> + +</body>''') +htmlview.print_real_text(None, xhtml=''' + <body xmlns='http://www.w3.org/1999/xhtml'> + + O + MG, + I'm green + with envy! + + </body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + http://test.com/ testing links autolinkifying +</body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + As Emerson said in his essay Self-Reliance: + + "A foolish consistency is the hobgoblin of little minds." + +</body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + + Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? + + + <img src='http://www.xmpp.org/images/psa-license.jpg' + alt='A License to Jabber' width='50%' height='50%'/> + +</body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + <ul style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> Two </li> + <li> Three </li> + </ul><hr /><pre style="background-color:rgb(120,120,120)">def fac(n): +def faciter(n,acc): +if n==0: return acc +return faciter(n-1, acc*n) +if n<0: raise ValueError('Must be non-negative') +return faciter(n,1)</pre> +</body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + <ol style='background-color:rgb(120,140,100)'> + <li> One </li> + <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> + <li> One </li> + <li style='font-size:50%'> Two </li> + <li style='font-size:200%'> Three </li> + <li style='font-size:9999pt'> Four </li> + </ul></li> + <li> Three </li></ol> +</body> + ''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + + + <a href='xmpp:example@example.org'>xmpp link</a> + : +<div xmlns='http://www.w3.org/1999/xhtml'> + <cite style='margin: 7px;' title='xmpp:examples@example.org'> + + examples(a)example.org wrote: + + this cite - bla bla bla, smile- :-) … + </cite> + <div> + some text + </div> +</div> + +#232/1 +</body> +''') +htmlview.print_real_text(None, xhtml='<hr />') +htmlview.print_real_text(None, xhtml=''' +<body xmlns='http://www.w3.org/1999/xhtml'> + +<img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ +AAAC8IyPqcvt3wCcDkiLc7C0qwyGHhSWpjQu5yqmCYsapyuvUUlvONmOZtfzgFz\ +ByTB10QgxOR0TqBQejhRNzOfkVJ+5YiUqrXF5Y5lKh/DeuNcP5yLWGsEbtLiOSp\ +a/TPg7JpJHxyendzWTBfX0cxOnKPjgBzi4diinWGdkF8kjdfnycQZXZeYGejmJl\ +ZeGl9i2icVqaNVailT6F5iJ90m6mvuTS4OK05M0vDk0Q4XUtwvKOzrcd3iq9uis\ +F81M1OIcR7lEewwcLp7tuNNkM3uNna3F2JQFo97Vriy/Xl4/f1cf5VWzXyym7PH\ +hhx4dbgYKAAA7' alt='Larry'/> +</body> +''') +htmlview.tv.show() +sw = Gtk.ScrolledWindow() +sw.set_property('hscrollbar-policy', Gtk.PolicyType.AUTOMATIC) +sw.set_property('vscrollbar-policy', Gtk.PolicyType.AUTOMATIC) +sw.set_property('border-width', 0) +sw.add(htmlview.tv) +sw.show() +frame = Gtk.Frame() +frame.set_shadow_type(Gtk.ShadowType.IN) +frame.show() +frame.add(sw) +win = Gtk.Window() +win.add(frame) +win.set_default_size(400, 300) +win.show_all() +win.connect('destroy', lambda win: Gtk.main_quit()) +Gtk.main() ===================================== test/lib/gajim_mocks.py ===================================== @@ -35,10 +35,8 @@ class MockConnection(Mock, ConnectionHandlers): app.nicks[account] = app.config.get_per('accounts', account, 'name') app.block_signed_in_notifications[account] = True app.sleeper_state[account] = 0 - app.encrypted_chats[account] = [] app.last_message_time[account] = {} app.status_before_autoaway[account] = '' - app.transport_avatar[account] = {} app.gajim_optional_features[account] = [] app.caps_hash[account] = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/efca9cd9c7296b4be1b2496c1390836f6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/efca9cd9c7296b4be1b2496c1390836f6… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove epydoc.conf
by Philipp Hörist 20 Sep '18

20 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: efca9cd9 by André Apitzsch at 2018-09-19T22:16:55Z Remove epydoc.conf it doesn't work with Python 3 and epydoc is no longer under development - - - - - 1 changed file: - − doc/epydoc.conf Changes: ===================================== doc/epydoc.conf deleted ===================================== @@ -1,29 +0,0 @@ -[epydoc] - -# Information about the project. -name: Gajim -url: http://gajim.org - -verbosity: 3 -imports: yes -redundant-details: yes -docformat: restructuredtext -# top: gajim - -# The list of modules to document. Modules can be named using -# dotted names, module filenames, or package directory names. -# This option may be repeated. -modules: gajim/* test/* - -# Write html output to the directory "apidocs" -#output: pdf -output: html -target: doc/apidocs/ - -# Include all automatically generated graphs. These graphs are -# generated using Graphviz dot. -graph: all -dotpath: /usr/bin/dot -graph-font: Sans -graph-font-size: 10 - View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/efca9cd9c7296b4be1b2496c1390836f65… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/efca9cd9c7296b4be1b2496c1390836f65… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ConvTextview: Rework display of encryption
by Philipp Hörist 19 Sep '18

19 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: fa65653a by Philipp Hörist at 2018-09-19T20:22:52Z ConvTextview: Rework display of encryption - - - - - 94b17b1f by Philipp Hörist at 2018-09-19T20:22:52Z Fix colors and icons - - - - - 0a66b6d9 by Philipp Hörist at 2018-09-19T20:22:52Z remove icon - - - - - 5 changed files: - gajim/chat_control_base.py - gajim/conversation_textview.py - − gajim/data/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png - gajim/data/style/gajim.css - gajim/gtk/history.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -338,6 +338,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self._schedule_activity_timers() self.encryption = self.get_encryption_state() + self.conv_textview.encryption_enabled = self.encryption is not None # PluginSystem: adding GUI extension point for ChatControlBase # instance object (also subclasses, eg. ChatControl or GroupchatControl) @@ -429,8 +430,9 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): def set_encryption_state(self, encryption): config_key = '%s-%s' % (self.account, self.contact.jid) self.encryption = encryption + self.conv_textview.encryption_enabled = encryption is not None app.config.set_per('encryption', config_key, - 'encryption', self.encryption or '') + 'encryption', self.encryption or '') def get_encryption_state(self): config_key = '%s-%s' % (self.account, self.contact.jid) ===================================== gajim/conversation_textview.py ===================================== @@ -186,6 +186,7 @@ class ConversationTextview(GObject.GObject): self.tv.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) self.tv.set_left_margin(2) self.tv.set_right_margin(2) + self._buffer = self.tv.get_buffer() self.handlers = {} self.image_cache = {} self.xep0184_marks = {} @@ -204,6 +205,7 @@ class ConversationTextview(GObject.GObject): self.account = account self.cursor_changed = False self.last_time_printout = 0 + self.encryption_enabled = False style = self.tv.get_style_context() style.add_class('gajim-conversation-font') @@ -261,6 +263,9 @@ class ConversationTextview(GObject.GObject): self.tagMarked.set_property('foreground', color) self.tagMarked.set_property('weight', Pango.Weight.BOLD) + textview_icon = buffer_.create_tag('textview-icon') + textview_icon.set_property('rise', Pango.units_from_double(-4.45)) + tag = buffer_.create_tag('time_sometimes') tag.set_property('foreground', 'darkgrey') #Pango.SCALE_SMALL @@ -1147,14 +1152,13 @@ class ConversationTextview(GObject.GObject): if kind == 'status': direction_mark = i18n.direction_mark + # print the encryption icon + self.print_encryption_status(iter_, additional_data) + # print the time stamp self.print_time(text, kind, tim, simple, direction_mark, other_tags_for_time, iter_) - icon = load_icon('channel-secure-croped-symbolic', self.tv, pixbuf=True) - if encrypted: - buffer_.insert_pixbuf(iter_, icon) - # If there's a displaymarking, print it here. if displaymarking: self.print_displaymarking(displaymarking, iter_=iter_) @@ -1275,6 +1279,52 @@ class ConversationTextview(GObject.GObject): if text.startswith('/me ') or text.startswith('/me\n'): return kind + def print_encryption_status(self, iter_, additional_data): + details = self._get_encryption_details(additional_data) + if details is None: + # Message was not encrypted + if not self.encryption_enabled: + return + icon = 'channel-insecure-symbolic' + color = 'unencrypted-color' + tooltip = _('Not encrypted') + else: + icon = 'channel-secure-symbolic' + color = 'encrypted-color' + name, fingerprint = details + if fingerprint is None: + tooltip = name + else: + tooltip = '%s %s' % (name, fingerprint) + + temp_mark = self._buffer.create_mark(None, iter_, True) + self._buffer.insert(iter_, ' ') + anchor = self._buffer.create_child_anchor(iter_) + anchor.plaintext = '' + self._buffer.insert(iter_, ' ') + + # Apply mark to vertically center the icon + start = self._buffer.get_iter_at_mark(temp_mark) + self._buffer.apply_tag_by_name('textview-icon', start, iter_) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + image.show() + image.set_tooltip_text(tooltip) + image.get_style_context().add_class(color) + self.tv.add_child_at_anchor(image, anchor) + + @staticmethod + def _get_encryption_details(additional_data): + encrypted = additional_data.get('encrypted') + if encrypted is None: + return + + name = encrypted.get('name') + if name is None: + return + fingerprint = encrypted.get('fingerprint') + return name, fingerprint + def print_time(self, text, kind, tim, simple, direction_mark, other_tags_for_time, iter_): local_tim = time.localtime(tim) buffer_ = self.tv.get_buffer() ===================================== gajim/data/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png deleted ===================================== Binary files a/gajim/data/icons/hicolor/16x16/status/channel-secure-croped-symbolic.symbolic.png and /dev/null differ ===================================== gajim/data/style/gajim.css ===================================== @@ -215,6 +215,10 @@ button.flat.link { padding: 0; border: 0; } .error-color { color: @error_color; } .warning-color { color: @warning_color; } +/*Encryption*/ +.encrypted-color { color: rgb(75, 181, 67) } +.unencrypted-color { color: @error_color } + /*Dataforms*/ .field-fixed { font-size: 16px; font-weight: bold; padding-top:5px;} .data-form-title { font-size: 16px; font-weight: bold; } ===================================== gajim/gtk/history.py ===================================== @@ -534,6 +534,10 @@ class HistoryWindow: buf.insert_with_tags_by_name( end_iter, tim + '\n', 'time_sometimes') + # print the encryption icon + self.history_textview.print_encryption_status( + end_iter, additional_data) + tag_name = '' tag_msg = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cb692ae4ebc7935e75e17255d7b5935bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/cb692ae4ebc7935e75e17255d7b5935bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make SQL INSERT querys more resilient
by Philipp Hörist 19 Sep '18

19 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb692ae4 by Philipp Hörist at 2018-09-19T18:12:24Z Make SQL INSERT querys more resilient Specify the column in which we insert otherwise downgrading Gajim is not possible anymore because the query breaks if we modified the column count in future - - - - - 1 changed file: - gajim/common/logger.py Changes: ===================================== gajim/common/logger.py ===================================== --- a/gajim/common/logger.py +++ b/gajim/common/logger.py @@ -177,7 +177,7 @@ class Logger: con.close() @staticmethod - def _get_user_version(con) -> int: + def _get_user_version(con: sqlite.Connection) -> int: """ Return the value of PRAGMA user_version. """ return con.execute('PRAGMA user_version').fetchone()[0] @@ -547,7 +547,7 @@ class Logger: if type_id == TypeConstant.NO_TRANSPORT: return 'jabber' - def convert_human_subscription_values_to_db_api_values(self, sub): + def convert_xmpp_sub(self, sub): """ Convert from string style to constant ints for db """ @@ -560,7 +560,7 @@ class Logger: if sub == 'both': return SubscriptionConstant.BOTH - def convert_db_api_values_to_human_subscription_values(self, sub): + def convert_db_sub(self, sub): """ Convert from constant ints for db to string style """ @@ -577,9 +577,10 @@ class Logger: """ Add unread message with id: message_id """ - sql = 'INSERT INTO unread_messages VALUES (%d, %d, 0)' % (message_id, - jid_id) - self.simple_commit(sql) + sql = '''INSERT INTO unread_messages (message_id, jid_id, shown) + VALUES (?, ?, 0)''' + self._con.execute(sql, (message_id, jid_id)) + self._timeout_commit() def set_read_messages(self, message_ids): """ @@ -947,8 +948,9 @@ class Logger: (type_id, jid) self.simple_commit(sql) return - sql = 'INSERT INTO transports_cache VALUES ("%s", %d)' % (jid, type_id) - self.simple_commit(sql) + sql = 'INSERT INTO transports_cache (transport, type) VALUES (?, ?)' + self._con.execute(sql, (jid, type_id)) + self._timeout_commit() def get_transports_type(self): """ @@ -1113,7 +1115,7 @@ class Logger: self._timeout_commit() def add_or_update_contact(self, account_jid, jid, name, sub, ask, groups, - commit=True): + commit=True): """ Add or update a contact from account_jid roster """ @@ -1124,29 +1126,30 @@ class Logger: try: account_jid_id = self.get_jid_id(account_jid) jid_id = self.get_jid_id(jid, type_=JIDConstant.NORMAL_TYPE) - except exceptions.PysqliteOperationalError as e: - raise exceptions.PysqliteOperationalError(str(e)) + except exceptions.PysqliteOperationalError as error: + raise exceptions.PysqliteOperationalError(str(error)) # Update groups information # First we delete all previous groups information - self._con.execute( - 'DELETE FROM roster_group WHERE account_jid_id=? AND jid_id=?', - (account_jid_id, jid_id)) + sql = 'DELETE FROM roster_group WHERE account_jid_id=? AND jid_id=?' + self._con.execute(sql, (account_jid_id, jid_id)) # Then we add all new groups information + sql = '''INSERT INTO roster_group (account_jid_id, jid_id, group_name) + VALUES (?, ?, ?)''' for group in groups: - self._con.execute('INSERT INTO roster_group VALUES(?, ?, ?)', - (account_jid_id, jid_id, group)) + self._con.execute(sql, (account_jid_id, jid_id, group)) if name is None: name = '' - self._con.execute(''' - REPLACE INTO roster_entry - (account_jid_id, jid_id, name, subscription, ask) - VALUES(?, ?, ?, ?, ?)''', ( - account_jid_id, jid_id, name, - self.convert_human_subscription_values_to_db_api_values(sub), - bool(ask))) + sql = '''REPLACE INTO roster_entry + (account_jid_id, jid_id, name, subscription, ask) + VALUES(?, ?, ?, ?, ?)''' + self._con.execute(sql, (account_jid_id, + jid_id, + name, + self.convert_xmpp_sub(sub), + bool(ask))) if commit: self._timeout_commit() @@ -1172,9 +1175,7 @@ class Logger: data[jid]['name'] = name else: data[jid]['name'] = None - data[jid]['subscription'] = \ - self.convert_db_api_values_to_human_subscription_values( - row.subscription) + data[jid]['subscription'] = self.convert_db_sub(row.subscription) data[jid]['groups'] = [] data[jid]['resources'] = {} if row.ask: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb692ae4ebc7935e75e17255d7b5935bf3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/cb692ae4ebc7935e75e17255d7b5935bf3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remote control: Better handle unknown types
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: c7c74998 by André Apitzsch at 2018-09-18T20:23:58Z Remote control: Better handle unknown types there is no corresponding GLib.Variant for None, use conversion to string as workaround - - - - - 1 changed file: - gajim/remote_control.py Changes: ===================================== gajim/remote_control.py ===================================== --- a/gajim/remote_control.py +++ b/gajim/remote_control.py @@ -62,7 +62,7 @@ def get_dbus_struct(obj): result.insert_value(key, get_dbus_struct(value)) return result.end() # unknown type - return None + return GLib.Variant('s', str(obj)) class Server: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c7c74998f23dae88479e46bd02ce8ee677… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/c7c74998f23dae88479e46bd02ce8ee677… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix undefined-loop-variable pylint error
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5b23d487 by Philipp Hörist at 2018-09-18T17:02:48Z Fix undefined-loop-variable pylint error - - - - - 46ed4757 by Philipp Hörist at 2018-09-18T17:03:14Z Update pre-push-tests.sh - - - - - 2 changed files: - gajim/htmltextview.py - scripts/dev/pre-push-tests.sh Changes: ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -498,7 +498,7 @@ class HtmlHandler(xml.sax.handler.ContentHandler): log.warning('Style attribute "%s" not yet implemented', style) else: __style_methods[style] = method - del style + del style # pylint: disable=undefined-loop-variable # -- def _get_style_tags(self): ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -12,5 +12,27 @@ pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611, # 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 +# E1128 assignment-from-none +# E1133 not-an-iterable +# E1136 unsubscriptable-object # R0201 no-self-use -# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ \ No newline at end of file +# R0901 too-many-ancestors +# R0904 too-many-public-methods +# R0913 too-many-arguments +# R0916 too-many-boolean-expressions +# R1702 +# R1706 +# R1711 +# R1716 +# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ +# W0201 attribute-defined-outside-init +# W0212 protected-access +# W0221 arguments-differ +# W0223 abstract-method +# W0311 bad-indentation +# W0401 wildcard-import +# W0603 global-statement +# W0613 unused-argument +# W0614 unused-wildcard-import \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7fcd85f0266727556b474298abd84145b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/7fcd85f0266727556b474298abd84145b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 422cd129 by Philipp Hörist at 2018-09-18T16:45:16Z Fix pylint errors - deprecated-method - anomalous-backslash-in-string - cell-var-from-loop - undefined-loop-variable - - - - - 7fcd85f0 by Philipp Hörist at 2018-09-18T16:53:13Z Update pylint error list - Check for W0631 undefined-loop-variable - Check for W0640 cell-var-from-loop - Check for W1401 anomalous-backslash-in-string - Check for W1505 deprecated-method - - - - - 8 changed files: - .gitlab-ci.yml - gajim/command_system/framework.py - gajim/common/config.py - gajim/common/optparser.py - gajim/common/zeroconf/zeroconf_bonjour.py - gajim/dataforms_widget.py - gajim/dialogs.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 --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,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --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 gajim run-build: stage: build ===================================== gajim/command_system/framework.py ===================================== --- a/gajim/command_system/framework.py +++ b/gajim/command_system/framework.py @@ -215,7 +215,7 @@ class Command: Extract handler's arguments specification, as it was defined preserving their order. """ - names, var_args, var_kwargs, defaults = getargspec(self.handler) + names, var_args, var_kwargs, defaults = getargspec(self.handler) # pylint: disable=W1505 # Behavior of this code need to be checked. Might yield # incorrect results on some rare occasions. ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -48,7 +48,7 @@ class Option(IntEnum): opt_int = ['integer', 0] opt_str = ['string', 0] opt_bool = ['boolean', 0] -opt_color = ['color', '^(#[0-9a-fA-F]{6})|()|rgb$\d+,\d+,\d+$|rgba$\d+,\d+,\d+,[01]\.?\d*$$'] +opt_color = ['color', r'(#[0-9a-fA-F]{6})|rgb$\d+,\d+,\d+$|rgba$\d+,\d+,\d+,[01]\.?\d*$'] opt_one_window_types = ['never', 'always', 'always_with_roster', 'peracct', 'pertype'] opt_show_roster_on_startup = ['always', 'never', 'last_state'] opt_treat_incoming_messages = ['', 'chat', 'normal'] ===================================== gajim/common/optparser.py ===================================== --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -59,7 +59,7 @@ class OptionsParser: for line in fd: match = regex.match(line) if match is None: - log.warn('Invalid configuration line, ignoring it: %s', line) + log.warning('Invalid configuration line, ignoring it: %s', line) continue optname, key, subname, value = match.groups() if key is None: ===================================== gajim/common/zeroconf/zeroconf_bonjour.py ===================================== --- a/gajim/common/zeroconf/zeroconf_bonjour.py +++ b/gajim/common/zeroconf/zeroconf_bonjour.py @@ -121,7 +121,7 @@ class Zeroconf: } # Split on '.' but do not split on '\.' - result = re.split('(?<!\\\\)\.', fullname) + result = re.split(r'(?<!\\\\)\.', fullname) name = result[0] protocol, domain = result[2:4] ===================================== gajim/dataforms_widget.py ===================================== --- a/gajim/dataforms_widget.py +++ b/gajim/dataforms_widget.py @@ -428,12 +428,12 @@ class SingleForm(Gtk.Table): widget.set_sensitive(readwrite) else: # more than 5 options: show combobox - def on_list_multi_treeview_changed(selection, f): - def for_selected(treemodel, path, iter_): + def on_list_multi_treeview_changed(selection, field_): + def for_selected(treemodel, _path, iter_): vals.append(treemodel[iter_][1]) vals = [] selection.selected_foreach(for_selected) - field.values = vals[:] + field_.values = vals[:] widget = Gtk.ScrolledWindow() widget.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) tv = gtkgui_helpers.create_list_multi(field.options, ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -104,6 +104,7 @@ class EditGroupsDialog: account, [group]) # FIXME: Ugly workaround. + # pylint: disable=undefined-loop-variable app.interface.roster.draw_group(_('General'), account) def add_group(self, group): @@ -116,6 +117,7 @@ class EditGroupsDialog: # FIXME: Ugly workaround. # Maybe we haven't been in any group (defaults to General) + # pylint: disable=undefined-loop-variable app.interface.roster.draw_group(_('General'), account) def on_add_button_clicked(self, widget): @@ -1692,17 +1694,15 @@ class VoIPCallReceivedDialog: out_xid = ctrl.xml.get_object('outgoing_drawingarea').\ get_property('window').get_xid() b = content.src_bin - found = False for e in b.children: - if e.get_name().startswith('autovideosink'): - found = True - break - if found: + if not e.get_name().startswith('autovideosink'): + continue for f in e.children: if f.get_name().startswith('autovideosink'): f.set_window_handle(out_xid) content.out_xid = out_xid break + break content.in_xid = in_xid ctrl.set_video_state('connecting', self.sid) # Now, accept the content/sessions. ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,5 +1,5 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --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,W0631,W0640,W1401,W1505 gajim +pylint --jobs=2 --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,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614 gajim # C0103 invalid-name # C0302 too-many-lines @@ -10,6 +10,7 @@ pylint --jobs=2 --disable=C0103,C0302,C0330,C0411,C0412,C0413,E0203,E0401,E0611, # E0203 access-member-before-definition # E0401 import-error # E0611 no-name-in-module -# E0710 raising-non-exception - GLIB -# E0712 catching-non-exception - GLIB -# R0201 no-self-use \ No newline at end of file +# E0710 raising-non-exception - GLib.GError is not recognized +# E0712 catching-non-exception - GLib.GError is not recognized +# R0201 no-self-use +# W0143 comparison-with-callable - Dont add to Server CI, only available on pylint 2.0+ \ No newline at end of file View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c80473ebe645e38c38b10a3d67d008f2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c80473ebe645e38c38b10a3d67d008f2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] pylint W0143 is not available on pylint < 2.0
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c80473e by Philipp Hörist at 2018-09-18T15:39:35Z pylint W0143 is not available on pylint < 2.0 - - - - - 2 changed files: - gajim/common/connection.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1031,7 +1031,7 @@ class Connection(CommonConnection, ConnectionHandlers): nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: # pylint: disable=W0143 + if self.on_connect_success == self._on_new_account: con.RegisterDisconnectHandler(self._on_new_account) if self.client_cert and app.config.get_per('accounts', self.name, ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -41,7 +41,6 @@ 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) - # pylint: disable=W0143 if action == roster.on_invite_to_room: item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c80473ebe645e38c38b10a3d67d008f27… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c80473ebe645e38c38b10a3d67d008f27… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Fix pylint errors
by Philipp Hörist 18 Sep '18

18 Sep '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 385ef2e4 by Philipp Hörist at 2018-09-18T15:02:14Z Fix pylint errors - duplicate-key - eval-used - comparison-with-callable - - - - - 803ff3de by Philipp Hörist at 2018-09-18T15:21:53Z Update pylint error list - Check for W0109 duplicate-key - Check for W0123 eval-used - Check for W0143 comparison-with-callable - - - - - 6 changed files: - .gitlab-ci.yml - gajim/common/connection.py - gajim/gui_interface.py - gajim/gui_menu_builder.py - gajim/htmltextview.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 --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,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim + - pylint3 --jobs=2 --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,W0631,W0640,W1401,W1505 gajim run-build: stage: build ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -1031,7 +1031,7 @@ class Connection(CommonConnection, ConnectionHandlers): nbxmpp.dispatcher_nb.DEFAULT_TIMEOUT_SECONDS = \ self.try_connecting_for_foo_secs # FIXME: this is a hack; need a better way - if self.on_connect_success == self._on_new_account: + if self.on_connect_success == self._on_new_account: # pylint: disable=W0143 con.RegisterDisconnectHandler(self._on_new_account) if self.client_cert and app.config.get_per('accounts', self.name, ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -1873,18 +1873,19 @@ class Interface: ################################################################################ def join_gc_room(self, account, room_jid, nick, password, minimize=False, - is_continued=False): + is_continued=False): """ Join the room immediately """ if app.contacts.get_contact(account, room_jid) and \ not app.contacts.get_contact(account, room_jid).is_groupchat(): - ErrorDialog(_('This is not a group chat'), + ErrorDialog( + _('This is not a group chat'), _('%(room_jid)s is already in your roster. Please check ' - 'if %(room_jid)s is a correct group chat name. If it is, ' - 'delete it from your roster and try joining the group chat ' - 'again.') % {'room_jid': room_jid, 'room_jid': room_jid}) + 'if %(room_jid)s is a correct group chat name. If it is, ' + 'delete it from your roster and try joining the group chat ' + 'again.') % {'room_jid': room_jid}) return if not nick: ===================================== gajim/gui_menu_builder.py ===================================== --- a/gajim/gui_menu_builder.py +++ b/gajim/gui_menu_builder.py @@ -41,7 +41,7 @@ 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) - + # pylint: disable=W0143 if action == roster.on_invite_to_room: item.connect('activate', action, [(c, account)], room_jid, room_account, c.resource) ===================================== gajim/htmltextview.py ===================================== --- a/gajim/htmltextview.py +++ b/gajim/htmltextview.py @@ -183,7 +183,7 @@ INLINE = INLINE_PHRASAL.union(INLINE_PRES).union(INLINE_STRUCT) LIST_ELEMS = set('dl, ol, ul'.split(', ')) for _name in BLOCK_HEAD: - _num = eval(_name[1]) + _num = int(_name[1]) _header_size = (_num - 1) // 2 _weight = (_num - 1) % 2 _element_styles[_name] = '; font-size: %s; %s' % (('large', 'medium', 'small')[_header_size], ===================================== scripts/dev/pre-push-tests.sh ===================================== --- a/scripts/dev/pre-push-tests.sh +++ b/scripts/dev/pre-push-tests.sh @@ -1,5 +1,5 @@ mypy -p gajim.common.modules --follow-imports=skip -pylint --jobs=2 --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,W0109,W0123,W0143,W0201,W0212,W0221,W0223,W0311,W0401,W0603,W0613,W0614,W0631,W0640,W1401,W1505 gajim +pylint --jobs=2 --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,W0631,W0640,W1401,W1505 gajim # C0103 invalid-name # C0302 too-many-lines View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/457faf38067537735acdaa8b67a4c22ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/457faf38067537735acdaa8b67a4c22ef… 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