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

Commits: 3989b66c by lovetox at 2020-06-02T12:47:57+02:00 Remove unused helper methods

- - - - - 03cb4723 by lovetox at 2020-06-02T13:06:04+02:00 Fix pylint errors

- - - - -

1 changed file:

- gajim/common/helpers.py

Changes:

===================================== gajim/common/helpers.py ===================================== @@ -34,8 +34,6 @@ import re import os import subprocess import webbrowser -import errno -import select import base64 import hashlib import shlex @@ -55,7 +53,6 @@ from string import Template import urllib from urllib.parse import unquote from io import StringIO -from datetime import datetime, timedelta from encodings.punycode import punycode_encode from functools import wraps from packaging.version import Version as V @@ -93,7 +90,10 @@ if app.is_installed('PYCURL'):

log = logging.getLogger('gajim.c.helpers')

-special_groups = (_('Transports'), _('Not in contact list'), _('Observers'), _('Group chats')) +special_groups = (_('Transports'), + _('Not in contact list'), + _('Observers'), + _('Group chats'))

URL_REGEX = re.compile( r"(www.(?!.)|[a-z][a-z0-9+.-]*://)[^\s<>'"]+[^!,.\s<>)'"]]") @@ -152,25 +152,18 @@ def parse_resource(resource): """ Perform stringprep on resource and return it """ - if resource: - try: - return resource.encode('OpaqueString').decode('utf-8') - except UnicodeError: - raise InvalidFormat('Invalid character in resource.') + if not resource: + return None

-def windowsify(s): - if os.name == 'nt': - return s.capitalize() - return s + try: + return resource.encode('OpaqueString').decode('utf-8') + except UnicodeError: + raise InvalidFormat('Invalid character in resource.')

-def temp_failure_retry(func, *args, **kwargs): - while True: - try: - return func(*args, **kwargs) - except (os.error, IOError, select.error) as ex: - if ex.errno == errno.EINTR: - continue - raise +def windowsify(word): + if os.name == 'nt': + return word.capitalize() + return word

def get_uf_show(show, use_mnemonic=False): """ @@ -223,7 +216,6 @@ def get_uf_show(show, use_mnemonic=False): uf_show = Q_('?contact has status:Has errors') return uf_show

- def get_uf_sub(sub): if sub == 'none': uf_sub = Q_('?Subscription we already have:None') @@ -352,8 +344,8 @@ def exec_command(command, use_shell=False, posix=True): subprocess.Popen('%s &' % command, shell=True).wait() else: args = shlex.split(command, posix=posix) - p = subprocess.Popen(args) - app.thread_interface(p.wait) + process = subprocess.Popen(args) + app.thread_interface(process.wait)

def build_command(executable, parameter): # we add to the parameter (can hold path with spaces) @@ -426,42 +418,6 @@ def get_account_status(account): status = reduce_chars_newlines(account['status_line'], 100, 1) return status

-def datetime_tuple(timestamp): - """ - Convert timestamp using strptime and the format: %Y%m%dT%H:%M:%S - - Because of various datetime formats are used the following exceptions - are handled: - - Optional milliseconds appended to the string are removed - - Optional Z (that means UTC) appended to the string are removed - - XEP-082 datetime strings have all '-' chars removed to meet - the above format. - """ - date, tim = timestamp.split('T', 1) - date = date.replace('-', '') - tim = tim.replace('z', '') - tim = tim.replace('Z', '') - zone = None - if '+' in tim: - sign = -1 - tim, zone = tim.split('+', 1) - if '-' in tim: - sign = 1 - tim, zone = tim.split('-', 1) - tim = tim.split('.')[0] - tim = time.strptime(date + 'T' + tim, '%Y%m%dT%H:%M:%S') - if zone: - zone = zone.replace(':', '') - tim = datetime.fromtimestamp(time.mktime(tim)) - if len(zone) > 2: - zone = time.strptime(zone, '%H%M') - else: - zone = time.strptime(zone, '%H') - zone = timedelta(hours=zone.tm_hour, minutes=zone.tm_min) - tim += zone * sign - tim = tim.timetuple() - return tim - def get_contact_dict_for_account(account): """ Create a dict of jid, nick -> contact with all contacts of account. @@ -470,8 +426,7 @@ def get_contact_dict_for_account(account): """ contacts_dict = {} for jid in app.contacts.get_jid_list(account): - contact = app.contacts.get_contact_with_highest_priority(account, - jid) + contact = app.contacts.get_contact_with_highest_priority(account, jid) contacts_dict[jid] = contact name = contact.name if name in contacts_dict: @@ -509,22 +464,25 @@ def check_soundfile_path(file_, dirs=None): if os.path.exists(file_): return file_

- for d in dirs: - d = os.path.join(d, 'sounds', file_) - if os.path.exists(d): - return d + for dir_ in dirs: + dir_ = os.path.join(dir_, 'sounds', file_) + if os.path.exists(dir_): + return dir_ return None

def strip_soundfile_path(file_, dirs=None, abs_=True): """ Remove knowns paths from a sound file

- Filechooser returns absolute path. If path is a known fallback path, we remove it. - So config have no hardcoded path to DATA_DIR and text in textfield is shorther. - param: file_: the filename to strip. - param: dirs: list of knowns paths from which the filename should be stripped. - param: abs_: force absolute path on dirs + Filechooser returns an absolute path. + If path is a known fallback path, we remove it. + So config has no hardcoded path to DATA_DIR and text in textfield is + shorther. + param: file_: the filename to strip + param: dirs: list of knowns paths from which the filename should be stripped + param: abs_: force absolute path on dirs """ + if not file_: return None

@@ -533,11 +491,11 @@ def strip_soundfile_path(file_, dirs=None, abs_=True): configpaths.get('DATA')]

name = os.path.basename(file_) - for d in dirs: - d = os.path.join(d, 'sounds', name) + for dir_ in dirs: + dir_ = os.path.join(dir_, 'sounds', name) if abs_: - d = os.path.abspath(d) - if file_ == d: + dir_ = os.path.abspath(dir_) + if file_ == dir_: return name return file_

@@ -629,8 +587,8 @@ def get_icon_name_to_show(contact, account=None): """ if account and app.events.get_nb_roster_events(account, contact.jid): return 'event' - if account and app.events.get_nb_roster_events( - account, contact.get_full_jid()): + if account and app.events.get_nb_roster_events(account, + contact.get_full_jid()): return 'event' if account and account in app.interface.minimized_controls and \ contact.jid in app.interface.minimized_controls[account] and app.interface.\ @@ -704,8 +662,9 @@ def get_os_info(): info = platform.system() return info

-def allow_showing_notification(account, type_='notify_on_new_message', -is_first_message=True): +def allow_showing_notification(account, + type_='notify_on_new_message', + is_first_message=True): """ Is it allowed to show nofication?

@@ -715,9 +674,9 @@ is_first_message=True): """ if type_ and (not app.config.get(type_) or not is_first_message): return False - if app.config.get('autopopupaway'): # always show notification + if app.config.get('autopopupaway'): return True - if app.connections[account].status in ('online', 'chat'): # we're online or chat + if app.connections[account].status in ('online', 'chat'): return True return False

@@ -728,7 +687,7 @@ def allow_popup_window(account): autopopup = app.config.get('autopopup') autopopupaway = app.config.get('autopopupaway') if autopopup and (autopopupaway or \ - app.connections[account].status in ('online', 'chat')): # we're online or chat + app.connections[account].status in ('online', 'chat')): return True return False

@@ -739,35 +698,12 @@ def allow_sound_notification(account, sound_event): return True return False

-def get_chat_control(account, contact): - full_jid_with_resource = contact.jid - if contact.resource: - full_jid_with_resource += '/' + contact.resource - highest_contact = app.contacts.get_contact_with_highest_priority( - account, contact.jid) - - # Look for a chat control that has the given resource, or default to - # one without resource - ctrl = app.interface.msg_win_mgr.get_control(full_jid_with_resource, - account) - - if ctrl: - return ctrl - - if (highest_contact and - highest_contact.resource and - contact.resource != highest_contact.resource): - return None - - # unknown contact or offline message - return app.interface.msg_win_mgr.get_control(contact.jid, account) - def get_notification_icon_tooltip_dict(): """ Return a dict of the form {acct: {'show': show, 'message': message, 'event_lines': [list of text lines to show in tooltip]} """ - # How many events must there be before they're shown summarized, not per-user + # How many events before we show summarized, not per-user max_ungrouped_events = 10

accounts = get_accounts_info() @@ -778,7 +714,8 @@ def get_notification_icon_tooltip_dict(): account['event_lines'] = [] # Gather events per-account pending_events = app.events.get_events(account=account_name) - messages, non_messages, total_messages, total_non_messages = {}, {}, 0, 0 + messages, non_messages = {}, {} + total_messages, total_non_messages = 0, 0 for jid in pending_events: for event in pending_events[jid]: if event.type_.count('file') > 0: @@ -792,19 +729,21 @@ def get_notification_icon_tooltip_dict(): # Display unread messages numbers, if any if total_messages > 0: if total_messages > max_ungrouped_events: - text = ngettext( - '%d message pending', - '%d messages pending', - total_messages, total_messages, total_messages) + text = ngettext('%d message pending', + '%d messages pending', + total_messages, + total_messages, + total_messages) account['event_lines'].append(text) else: for jid in messages: - text = ngettext( - '%d message pending', - '%d messages pending', - messages[jid], messages[jid], messages[jid]) + text = ngettext('%d message pending', + '%d messages pending', + messages[jid], + messages[jid], + messages[jid]) contact = app.contacts.get_first_contact_from_jid( - account['name'], jid) + account['name'], jid) text += ' ' if jid in app.gc_connected[account['name']]: text += _('from group chat %s') % (jid) @@ -818,64 +757,24 @@ def get_notification_icon_tooltip_dict(): # Display unseen events numbers, if any if total_non_messages > 0: if total_non_messages > max_ungrouped_events: - text = ngettext( - '%d event pending', - '%d events pending', - total_non_messages, total_non_messages, total_non_messages) + text = ngettext('%d event pending', + '%d events pending', + total_non_messages, + total_non_messages, + total_non_messages) account['event_lines'].append(text) else: for jid in non_messages: - text = ngettext('%d event pending', '%d events pending', - non_messages[jid], non_messages[jid], non_messages[jid]) + text = ngettext('%d event pending', + '%d events pending', + non_messages[jid], + non_messages[jid], + non_messages[jid]) text += ' ' + _('from user %s') % (jid) account[account]['event_lines'].append(text)

return accounts

-def get_notification_icon_tooltip_text(): - text = None - # How many events must there be before they're shown summarized, not per-user - # max_ungrouped_events = 10 - # Character which should be used to indent in the tooltip. - indent_with = ' ' - - accounts = get_notification_icon_tooltip_dict() - - if not accounts: - # No configured account - return _('Gajim') - - # at least one account present - - # Is there more that one account? - if len(accounts) == 1: - show_more_accounts = False - else: - show_more_accounts = True - - # If there is only one account, its status is shown on the first line. - if show_more_accounts: - text = _('Gajim') - else: - text = _('Gajim - %s') % (get_account_status(accounts[0])) - - # Gather and display events. (With accounts, when there are more.) - for account in accounts: - account_name = account['name'] - # Set account status, if not set above - if show_more_accounts: - message = '\n' + indent_with + ' %s - %s' - text += message % (account_name, get_account_status(account)) - # Account list shown, messages need to be indented more - indent_how = 2 - else: - # If no account list is shown, messages could have default indenting. - indent_how = 1 - for line in account['event_lines']: - text += '\n' + indent_with * indent_how + ' ' - text += line - return text - def get_accounts_info(): """ Helper for notification icon tooltip @@ -959,20 +858,6 @@ def get_subscription_request_msg(account=None): s = Template(s).safe_substitute({'name': name}) return s

-def replace_dataform_media(form, stanza): - found = False - for field in form.getTags('field'): - for media in field.getTags('media'): - for uri in media.getTags('uri'): - uri_data = uri.getData() - if uri_data.startswith('cid:'): - uri_data = uri_data[4:] - for data in stanza.getTags('data', namespace=Namespace.BOB): - if data.getAttr('cid') == uri_data: - uri.setData(data.getData()) - found = True - return found - def get_user_proxy(account): proxy_name = app.config.get_per('accounts', account, 'proxy') if not proxy_name: @@ -1030,7 +915,9 @@ def _get_img_direct(attrs): f.fp._sock.fp._sock.settimeout(2) except Exception: pass - # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + + # On a slow internet connection with ~1000kbps + # you need ~10 seconds for 1 MB deadline = time.time() + (10 * (max_size / 1048576)) while True: if time.time() > deadline: @@ -1080,7 +967,9 @@ def _get_img_proxy(attrs, proxy): c.setopt(pycurl.FOLLOWLOCATION, 1) # Wait maximum 10s for connection c.setopt(pycurl.CONNECTTIMEOUT, 10) - # On a slow internet connection with ~1000kbps you need ~10 seconds for 1 MB + + # On a slow internet connection with ~1000kbps + # you need ~10 seconds for 1 MB c.setopt(pycurl.TIMEOUT, 10 * (max_size / 1048576)) c.setopt(pycurl.MAXFILESIZE, max_size) c.setopt(pycurl.WRITEFUNCTION, b.write) @@ -1504,6 +1393,7 @@ def get_alternative_venue(error): uri = parse_uri(error.condition_data) if uri.type == URIType.XMPP and uri.action == URIAction.JOIN: return uri.data['jid'] + return None

def is_affiliation_change_allowed(self_contact, contact, target_aff):

View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/557334a60ddf0530937ef11c838abb1b...