Commits August 2017

commits@gajim.org

1 participants
94 discussions

[Git][gajim/gajim][master] 2 commits: add issue templates
by Yann Leboulanger 30 Aug '17

30 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d3c1d97 by Yann Leboulanger at 2017-08-30T21:25:06+02:00 add issue templates - - - - - 30efd222 by Yann Leboulanger at 2017-08-30T21:32:49+02:00 Merge branch 'master' into 'master' Add issue templates See merge request !127 - - - - - 2 changed files: - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Enhancement.md Changes: ===================================== .gitlab/issue_templates/Bug.md ===================================== --- /dev/null +++ b/.gitlab/issue_templates/Bug.md @@ -0,0 +1,21 @@ +**Please first check if another issue has been opened for your problem** + +## Versions + + - OS: + - Gajim version: + - GTK version: + - Python-nbxmpp version: + +## Steps to reproduce the problem + + 1. + 1. + 1. + +## Expected behavior + + +## Actual behavior + + ===================================== .gitlab/issue_templates/Enhancement.md ===================================== --- /dev/null +++ b/.gitlab/issue_templates/Enhancement.md @@ -0,0 +1,5 @@ +**Please note by far the quickest way to get a new feature is to file a Merge Request.** + +## Description of the new feature + + View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b7efb3604ed3c0fd2fe95b02b53040390… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b7efb3604ed3c0fd2fe95b02b53040390… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: gtkgui_helpers: remove some unused code
by Yann Leboulanger 28 Aug '17

28 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: fbc58517 by André Apitzsch at 2017-08-27T22:43:47+02:00 gtkgui_helpers: remove some unused code - - - - - b7efb360 by Yann Leboulanger at 2017-08-28T15:38:55+02:00 Merge branch 'gtkgui_helpers' into 'master' gtkgui_helpers: remove some unused code See merge request !125 - - - - - 1 changed file: - gajim/gtkgui_helpers.py Changes: ===================================== gajim/gtkgui_helpers.py ===================================== --- a/gajim/gtkgui_helpers.py +++ b/gajim/gtkgui_helpers.py @@ -202,99 +202,6 @@ def get_theme_font_for_option(theme, option): fd.merge(font_desc, True) return fd.to_string() -def get_default_font(): - """ - Get the desktop setting for application font first check for GNOME, then - Xfce and last KDE it returns None on failure or else a string 'Font Size' - """ - try: - gi.require_version('GConf', '2.0') - from gi.repository import GConf - client = GConf.Client.get_default() - value = client.get_string("/desktop/gnome/interface/font_name") - return value.decode("utf8") - except ValueError: - pass - - # try to get Xfce default font - # Xfce 4.2 and higher follow freedesktop.org's Base Directory Specification - # see http://www.xfce.org/~benny/xfce/file-locations.html - # and http://freedesktop.org/Standards/basedir-spec - xdg_config_home = os.environ.get('XDG_CONFIG_HOME', '') - if xdg_config_home == '': - xdg_config_home = os.path.expanduser('~/.config') # default - xfce_config_file = os.path.join(xdg_config_home, - 'xfce4/mcs_settings/Gtk.xml') - - kde_config_file = os.path.expanduser('~/.kde/share/config/kdeglobals') - - if os.path.exists(xfce_config_file): - try: - for line in open(xfce_config_file): - if line.find('name="Gtk/FontName"') != -1: - start = line.find('value="') + 7 - return line[start:line.find('"', start)] - except Exception: - #we talk about file - print(_('Error: cannot open %s for reading') % xfce_config_file, - file=sys.stderr) - - elif os.path.exists(kde_config_file): - try: - for line in open(kde_config_file): - if line.find('font=') == 0: # font=Verdana,9,other_numbers - start = 5 # 5 is len('font=') - line = line[start:] - values = line.split(',') - font_name = values[0] - font_size = values[1] - font_string = '%s %s' % (font_name, font_size) # Verdana 9 - return font_string - except Exception: - #we talk about file - print(_('Error: cannot open %s for reading') % kde_config_file, - file=sys.stderr) - - return None - -def get_running_processes(): - """ - Return running processes or None (if /proc does not exist) - """ - if os.path.isdir('/proc'): - # under Linux: checking if 'gnome-session' or - # 'startkde' programs were run before gajim, by - # checking /proc (if it exists) - # - # if something is unclear, read `man proc`; - # if /proc exists, directories that have only numbers - # in their names contain data about processes. - # /proc/[xxx]/exe is a symlink to executable started - # as process number [xxx]. - # filter out everything that we are not interested in: - files = os.listdir('/proc') - - # files that doesn't have only digits in names... - files = [f for f in files if f.isdigit()] - - # files that aren't directories... - files = [f for f in files if os.path.isdir('/proc/' + f)] - - # processes owned by somebody not running gajim... - # (we check if we have access to that file) - files = [f for f in files if os.access('/proc/' + f +'/exe', os.F_OK)] - - # be sure that /proc/[number]/exe is really a symlink - # to avoid TBs in incorrectly configured systems - files = [f for f in files if os.path.islink('/proc/' + f + '/exe')] - - # list of processes - processes = [os.path.basename(os.readlink('/proc/' + f +'/exe')) for f \ - in files] - - return processes - return [] - def move_window(window, x, y): """ Move the window, but also check if out of screen @@ -358,45 +265,6 @@ def scroll_to_end(widget): return False -class HashDigest: - def __init__(self, algo, digest): - self.algo = self.cleanID(algo) - self.digest = self.cleanID(digest) - - def cleanID(self, id_): - id_ = id_.strip().lower() - for strip in (' :.-_'): - id_ = id_.replace(strip, '') - return id_ - - def __eq__(self, other): - sa, sd = self.algo, self.digest - if isinstance(other, self.__class__): - oa, od = other.algo, other.digest - elif isinstance(other, str): - sa, oa, od = None, None, self.cleanID(other) - elif isinstance(other, tuple) and len(other) == 2: - oa, od = self.cleanID(other[0]), self.cleanID(other[1]) - else: - return False - - return sa == oa and sd == od - - def __ne__(self, other): - return not self == other - - def __hash__(self): - return self.algo ^ self.digest - - def __str__(self): - prettydigest = '' - for i in range(0, len(self.digest), 2): - prettydigest += self.digest[i:i + 2] + ':' - return prettydigest[:-1] - - def __repr__(self): - return "%s(%s, %s)" % (self.__class__, repr(self.algo), repr(str(self))) - class ServersXMLHandler(xml.sax.ContentHandler): def __init__(self): xml.sax.ContentHandler.__init__(self) @@ -433,49 +301,6 @@ def set_unset_urgency_hint(window, unread_messages_no): else: window.props.urgency_hint = False -def get_abspath_for_script(scriptname, want_type = False): - """ - Check if we are svn or normal user and return abspath to asked script if - want_type is True we return 'svn' or 'install' - """ - if os.path.isdir('.svn'): # we are svn user - type_ = 'svn' - cwd = os.getcwd() # it's always ending with src - - if scriptname == 'gajim-remote': - path_to_script = cwd + '/gajim-remote.py' - - elif scriptname == 'gajim': - script = '#!/bin/sh\n' # the script we may create - script += 'cd %s' % cwd - path_to_script = cwd + '/../scripts/gajim_sm_script' - - try: - if os.path.exists(path_to_script): - os.remove(path_to_script) - - f = open(path_to_script, 'w') - script += '\nexec python -OOt gajim.py $0 $@\n' - f.write(script) - f.close() - os.chmod(path_to_script, 0o700) - except OSError: # do not traceback (could be a permission problem) - #we talk about a file here - s = _('Could not write to %s. Session Management support will ' - 'not work') % path_to_script - print(s, file=sys.stderr) - - else: # normal user (not svn user) - type_ = 'install' - # always make it like '/usr/local/bin/gajim' - path_to_script = helpers.is_in_path(scriptname, True) - - - if want_type: - return path_to_script, type_ - else: - return path_to_script - # feeding the image directly into the pixbuf seems possible, but is error prone and causes image distortions and segfaults. # see http://stackoverflow.com/a/8892894/3528174 # and https://developer.gnome.org/gdk-pixbuf/unstable/gdk-pixbuf-Image-Data-in-Me… @@ -734,27 +559,6 @@ def make_pixbuf_grayscale(pixbuf): pixbuf.saturate_and_pixelate(pixbuf2, 0.0, False) return pixbuf2 -def escape_underscore(s): - """ - Escape underlines to prevent them from being interpreted as keyboard - accelerators - """ - return s.replace('_', '__') - -def get_state_image_from_file_path_show(file_path, show): - state_file = show.replace(' ', '_') - files = [] - files.append(os.path.join(file_path, state_file + '.png')) - files.append(os.path.join(file_path, state_file + '.gif')) - image = Gtk.Image() - image.set_from_pixbuf(None) - for file_ in files: - if os.path.exists(file_): - image.set_from_file(file_) - break - - return image - def get_possible_button_event(event): """ Mouse or keyboard caused the event? @@ -839,9 +643,6 @@ def on_avatar_save_as_menuitem_activate(widget, jid, default_name=''): dialog.connect('delete-event', lambda widget, event: on_cancel(widget)) -def on_bm_header_changed_state(widget, event): - widget.set_state(Gtk.StateType.NORMAL) #do not allow selected_state - def create_combobox(value_list, selected_value = None): """ Value_list is [(label1, value1)] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec1d75f15b6d3925b4fe77c12083cba10… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ec1d75f15b6d3925b4fe77c12083cba10… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix typo in link
by Philipp Hörist 27 Aug '17

27 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ec1d75f1 by Philipp Hörist at 2017-08-27T22:41:11+02:00 Fix typo in link - - - - - 1 changed file: - gajim/common/rst_xhtml_generator.py Changes: ===================================== gajim/common/rst_xhtml_generator.py ===================================== --- a/gajim/common/rst_xhtml_generator.py +++ b/gajim/common/rst_xhtml_generator.py @@ -94,7 +94,7 @@ else: 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', pos_int_validator) generate_uri_role('gajim-ticket-reference', ('ticket', 'gtrack'), - 'Gajim Ticket #', 'https://dev.gajim.org/gajim/gajim/issues', '%d', + 'Gajim Ticket #', 'https://dev.gajim.org/gajim/gajim/issues/', '%d', pos_int_validator) class HTMLGenerator: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec1d75f15b6d3925b4fe77c12083cba103… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ec1d75f15b6d3925b4fe77c12083cba103… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update old trac links
by Philipp Hörist 27 Aug '17

27 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 298fa4b9 by Philipp Hörist at 2017-08-27T22:32:33+02:00 Update old trac links - - - - - 3 changed files: - gajim/common/exceptions.py - gajim/common/rst_xhtml_generator.py - plugins/acronyms_expander/acronyms_expander.py Changes: ===================================== gajim/common/exceptions.py ===================================== --- a/gajim/common/exceptions.py +++ b/gajim/common/exceptions.py @@ -80,7 +80,7 @@ class SessionBusNotPresent(Exception): def __str__(self): return _('Session bus is not available.\nTry reading %(url)s') % \ - {'url': 'http://trac.gajim.org/wiki/GajimDBus'} + {'url': 'https://dev.gajim.org/gajim/gajim/wikis/help/GajimDBus'} class SystemBusNotPresent(Exception): """ @@ -92,7 +92,7 @@ class SystemBusNotPresent(Exception): def __str__(self): return _('System bus is not available.\nTry reading %(url)s') % \ - {'url': 'http://trac.gajim.org/wiki/GajimDBus'} + {'url': 'https://dev.gajim.org/gajim/gajim/wikis/help/GajimDBus'} class NegotiationError(Exception): """ ===================================== gajim/common/rst_xhtml_generator.py ===================================== --- a/gajim/common/rst_xhtml_generator.py +++ b/gajim/common/rst_xhtml_generator.py @@ -94,7 +94,7 @@ else: 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', pos_int_validator) generate_uri_role('gajim-ticket-reference', ('ticket', 'gtrack'), - 'Gajim Ticket #', 'http://trac.gajim.org/ticket/', '%d', + 'Gajim Ticket #', 'https://dev.gajim.org/gajim/gajim/issues', '%d', pos_int_validator) class HTMLGenerator: ===================================== plugins/acronyms_expander/acronyms_expander.py ===================================== --- a/plugins/acronyms_expander/acronyms_expander.py +++ b/plugins/acronyms_expander/acronyms_expander.py @@ -51,9 +51,8 @@ class AcronymsExpanderPlugin(GajimPlugin): 'ACRONYMS': ({'/slap': '/me slaps', 'PS-': 'plug-in system', 'G-': 'Gajim', - 'GNT-': 'http://trac.gajim.org/newticket', - 'GW-': 'http://trac.gajim.org/', - 'GTS-': 'http://trac.gajim.org/report', + 'GNT-': 'https://dev.gajim.org/gajim/gajim/issues', + 'GW-': 'https://dev.gajim.org/gajim/gajim/wikis/home', }, ''), } View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298fa4b96d61549745c951f2ff359b6ddd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/298fa4b96d61549745c951f2ff359b6ddd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update ascii smilies
by Philipp Hörist 27 Aug '17

27 Aug '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2e1c1062 by Philipp Hörist at 2017-08-27T22:29:02+02:00 Update ascii smilies - - - - - 1 changed file: - data/emoticons/noto-emoticons/emoticons_theme.py Changes: ===================================== data/emoticons/noto-emoticons/emoticons_theme.py ===================================== --- a/data/emoticons/noto-emoticons/emoticons_theme.py +++ b/data/emoticons/noto-emoticons/emoticons_theme.py @@ -12,14 +12,14 @@ emoticons = OrderedDict([ # subgroup: face-positive ('u1f600.png', [u'\U0001f600']), ('u1f601.png', [u'\U0001f601']), - ('u1f602.png', [u'\U0001f602', ':-D', ':D']), + ('u1f602.png', [u'\U0001f602', ':\'-)', ':\')']), ('u1f923.png', [u'\U0001f923']), - ('u1f603.png', [u'\U0001f603']), + ('u1f603.png', [u'\U0001f603', ':-D', ':D', '=D']), ('u1f604.png', [u'\U0001f604']), ('u1f605.png', [u'\U0001f605']), ('u1f606.png', [u'\U0001f606']), ('u1f609.png', [u'\U0001f609', ';-)', ';)']), - ('u1f60a.png', [u'\U0001f60a', ':-)', ':)']), + ('u1f60a.png', [u'\U0001f60a']), ('u1f60b.png', [u'\U0001f60b']), ('u1f60e.png', [u'\U0001f60e', '8-)', 'B-)']), ('u1f60d.png', [u'\U0001f60d', '<3']), @@ -27,7 +27,7 @@ emoticons = OrderedDict([ ('u1f617.png', [u'\U0001f617']), ('u1f619.png', [u'\U0001f619']), ('u1f61a.png', [u'\U0001f61a']), - ('u263a.png', [u'\u263a']), + ('u263a.png', [u'\u263a', ':-)', ':)', '=)', '=]', ':]']), ('u1f642.png', [u'\U0001f642']), ('u1f917.png', [u'\U0001f917']), View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e1c10620fe6356138b97c6abe103c16be… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/2e1c10620fe6356138b97c6abe103c16be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: common.helpers: simplify get_os_info()
by Yann Leboulanger 27 Aug '17

27 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 66b49c24 by André Apitzsch at 2017-08-26T00:19:32+02:00 common.helpers: simplify get_os_info() - - - - - d6a8a238 by Yann Leboulanger at 2017-08-27T22:22:02+02:00 Merge branch 'os_info' into 'master' common.helpers: simplify get_os_info() See merge request !122 - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -581,18 +581,6 @@ def get_xmpp_show(show): return None return show -def get_output_of_command(command): - try: - child_stdin, child_stdout = os.popen2(command) - except ValueError: - return None - - output = child_stdout.readlines() - child_stdout.close() - child_stdin.close() - - return output - def sanitize_filename(filename): """ Make sure the filename we will write does contain only acceptable and latin @@ -1044,29 +1032,6 @@ def remove_invalid_xml_chars(string): string = re.sub(app.interface.invalid_XML_chars_re, '', string) return string -distro_info = { - 'Arch Linux': '/etc/arch-release', - 'Aurox Linux': '/etc/aurox-release', - 'Conectiva Linux': '/etc/conectiva-release', - 'CRUX': '/usr/bin/crux', - 'Debian GNU/Linux': '/etc/debian_version', - 'Fedora Linux': '/etc/fedora-release', - 'Gentoo Linux': '/etc/gentoo-release', - 'Linux from Scratch': '/etc/lfs-release', - 'Mandrake Linux': '/etc/mandrake-release', - 'Slackware Linux': '/etc/slackware-version', - 'Solaris/Sparc': '/etc/release', - 'Source Mage': '/etc/sourcemage_version', - 'SUSE Linux': '/etc/SuSE-release', - 'Sun JDS': '/etc/sun-release', - 'PLD Linux': '/etc/pld-release', - 'Yellow Dog Linux': '/etc/yellowdog-release', - 'AgiliaLinux': '/etc/agilialinux-version', - # many distros use the /etc/redhat-release for compatibility - # so Redhat is the last - 'Redhat Linux': '/etc/redhat-release' -} - def get_random_string_16(): """ Create random string of length 16 @@ -1080,84 +1045,18 @@ def get_random_string_16(): def get_os_info(): if app.os_info: return app.os_info - if os.name == 'nt': - # platform.release() seems to return the name of the windows - ver = sys.getwindowsversion() - ver_format = ver[3], ver[0], ver[1] - win_version = { - (1, 4, 0): '95', - (1, 4, 10): '98', - (1, 4, 90): 'ME', - (2, 4, 0): 'NT', - (2, 5, 0): '2000', - (2, 5, 1): 'XP', - (2, 5, 2): '2003', - (2, 6, 0): 'Vista', - (2, 6, 1): '7', - } - if ver_format in win_version: - os_info = 'Windows' + ' ' + win_version[ver_format] - else: - os_info = 'Windows' - app.os_info = os_info - return os_info + app.os_info = 'N/A' + if os.name == 'nt' or sys.platform == 'darwin': + import platform + app.os_info = platform.system() + " " + platform.release() elif os.name == 'posix': - executable = 'lsb_release' - params = ' --description --codename --release --short' - full_path_to_executable = is_in_path(executable, return_abs_path = True) - if full_path_to_executable: - command = executable + params - p = subprocess.Popen([command], shell=True, stdin=subprocess.PIPE, - stdout=subprocess.PIPE, close_fds=True) - p.wait() - output = temp_failure_retry(p.stdout.readline).strip() - # some distros put n/a in places, so remove those - output = output.decode('utf-8').replace('n/a', '').replace('N/A', '') - app.os_info = output - p.stdout.close() - p.stdin.close() - return output - - # lsb_release executable not available, so parse files - for distro_name in distro_info: - path_to_file = distro_info[distro_name] - if os.path.exists(path_to_file): - if os.access(path_to_file, os.X_OK): - # the file is executable (f.e. CRUX) - # yes, then run it and get the first line of output. - text = get_output_of_command(path_to_file)[0] - else: - fd = open(path_to_file) - text = fd.readline().strip() # get only first line - fd.close() - if path_to_file.endswith('version'): - # sourcemage_version and slackware-version files - # have all the info we need (name and version of distro) - if not os.path.basename(path_to_file).startswith( - 'sourcemage') or not\ - os.path.basename(path_to_file).startswith('slackware'): - text = distro_name + ' ' + text - elif path_to_file.endswith('aurox-release') or \ - path_to_file.endswith('arch-release'): - # file doesn't have version - text = distro_name - elif path_to_file.endswith('lfs-release'): - # file just has version - text = distro_name + ' ' + text - os_info = text.replace('\n', '') - app.os_info = os_info - return os_info - - # our last chance, ask uname and strip it - uname_output = get_output_of_command('uname -sr') - if uname_output is not None: - os_info = uname_output[0] # only first line - app.os_info = os_info - return os_info - os_info = 'N/A' - app.os_info = os_info - return os_info - + try: + import distro + app.os_info = distro.name(pretty=True) + except ImportError: + import platform + app.os_info = platform.system() + return app.os_info def allow_showing_notification(account, type_='notify_on_new_message', is_first_message=True): View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c862ecd83d96c86977242adaba01bca9a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/c862ecd83d96c86977242adaba01bca9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: add pylint run to CI
by Yann Leboulanger 27 Aug '17

27 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 915ad152 by Yann Leboulanger at 2017-08-27T21:43:28+02:00 add pylint run to CI - - - - - c862ecd8 by Yann Leboulanger at 2017-08-27T22:12:04+02:00 Merge branch 'master' into 'master' add pylint run to CI See merge request !123 - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ before_script: - - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly + - sudo apt-get update -qq && sudo apt-get install -y -qq libtool pkg-config python3-openssl gir1.2-gtk-3.0 python3-gi python3-nbxmpp-nightly pylint3 - sudo apt-get build-dep -y -qq gajim-default-nightly stages: @@ -12,6 +12,11 @@ run-test: - ./autogen.sh - make test_nogui +run-pylint: + stage: test + script: + - pylint3 --additional-builtins=_ --disable=all --enable=E0001,E0011,E0012,E0100,E0101,E0102,E0103,E0104,E0105,E0106,E0107,E0108,E0202,E0221,E0222,E0235,E0501,E0502,E0503,E0602,E0603,E0604,E0701,E0702,E1001,E1002,E1003,E1004,E1111,E1120,E1121,E1122,E1123,E1124,E1125,E1200,E1201,E1205,E1206,E1300,E1301,E1302,E1303,E1304,E1305,E1306,E1310,E1700,E1701 gajim + run-build: stage: build script: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa087c34ad1fd026b9961c0131353af70… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/aa087c34ad1fd026b9961c0131353af70… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: dataforms: Replace @nested_property with @property.
by Yann Leboulanger 27 Aug '17

27 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 63947c42 by Emmanuel Gil Peyrot at 2017-08-27T20:57:35+01:00 dataforms: Replace @nested_property with @property. - - - - - aa087c34 by Yann Leboulanger at 2017-08-27T22:08:48+02:00 Merge branch 'dataforms' into 'master' Replace @nested_property with @property in dataforms See merge request !124 - - - - - 1 changed file: - gajim/common/dataforms.py Changes: ===================================== gajim/common/dataforms.py ===================================== --- a/gajim/common/dataforms.py +++ b/gajim/common/dataforms.py @@ -49,14 +49,6 @@ class ExtendedNode(nbxmpp.Node, object): extend.__class__ = cls return extend -# helper decorator to create properties in cleaner way -def nested_property(f): - ret = f() - p = {'doc': f.__doc__} - for v in ('fget', 'fset', 'fdel', 'doc'): - if v in ret.keys(): p[v]=ret[v] - return property(**p) - # helper to create fields from scratch def Field(typ, **attrs): ''' Helper function to create a field of given type. ''' @@ -131,123 +123,115 @@ class DataField(ExtendedNode): self.required = required self.options = options - @nested_property - def type_(): # pylint: disable=E0202 + @property + def type_(self): """ Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi', 'text-private', 'text-single'. If you set this to something different, DataField will store given name, but treat all data as text-single """ - def fget(self): - t = self.getAttr('type') - if t is None: - return 'text-single' - return t - - def fset(self, value): - assert isinstance(value, str) - self.setAttr('type', value) + t = self.getAttr('type') + if t is None: + return 'text-single' + return t - return locals() + @type_.setter + def type_(self, value): + assert isinstance(value, str) + self.setAttr('type', value) - @nested_property - def var(): # pylint: disable=E0202 + @property + def var(self): """ Field identifier """ - def fget(self): - return self.getAttr('var') - - def fset(self, value): - assert isinstance(value, str) - self.setAttr('var', value) + return self.getAttr('var') - def fdel(self): - self.delAttr('var') + @var.setter + def var(self, value): + assert isinstance(value, str) + self.setAttr('var', value) - return locals() + @var.deleter + def var(self): + self.delAttr('var') - @nested_property - def label(): # pylint: disable=E0202 + @property + def label(self): """ Human-readable field name """ - def fget(self): - l = self.getAttr('label') - if not l: - l = self.var - return l - - def fset(self, value): - assert isinstance(value, str) - self.setAttr('label', value) + l = self.getAttr('label') + if not l: + l = self.var + return l - def fdel(self): - if self.getAttr('label'): - self.delAttr('label') + @label.setter + def label(self, value): + assert isinstance(value, str) + self.setAttr('label', value) - return locals() + @label.deleter + def label(self): + if self.getAttr('label'): + self.delAttr('label') - @nested_property - def description(): + @property + def description(self): """ Human-readable description of field meaning """ - def fget(self): - return self.getTagData('desc') or '' - - def fset(self, value): - assert isinstance(value, str) - if value == '': - fdel(self) - else: - self.setTagData('desc', value) + return self.getTagData('desc') or '' - def fdel(self): - t = self.getTag('desc') - if t is not None: - self.delChild(t) + @description.setter + def description(self, value): + assert isinstance(value, str) + if value == '': + del self.description + else: + self.setTagData('desc', value) - return locals() + @description.deleter + def description(self): + t = self.getTag('desc') + if t is not None: + self.delChild(t) - @nested_property - def required(): # pylint: disable=E0202 + @property + def required(self): """ Controls whether this field required to fill. Boolean """ - def fget(self): - return bool(self.getTag('required')) - - def fset(self, value): - t = self.getTag('required') - if t and not value: - self.delChild(t) - elif not t and value: - self.addChild('required') + return bool(self.getTag('required')) - return locals() + @required.setter + def required(self, value): + t = self.getTag('required') + if t and not value: + self.delChild(t) + elif not t and value: + self.addChild('required') - @nested_property - def media(): + @property + def media(self): """ Media data """ - def fget(self): - media = self.getTag('media', namespace=nbxmpp.NS_DATA_MEDIA) - if media: - return Media(media) + media = self.getTag('media', namespace=nbxmpp.NS_DATA_MEDIA) + if media: + return Media(media) - def fset(self, value): - fdel(self) - self.addChild(node=value) + @media.setter + def media(self, value): + del self.media + self.addChild(node=value) - def fdel(self): - t = self.getTag('media') - if t is not None: - self.delChild(t) - - return locals() + @media.deleter + def media(self): + t = self.getTag('media') + if t is not None: + self.delChild(t) def is_valid(self): return True @@ -256,146 +240,141 @@ class Uri(nbxmpp.Node): def __init__(self, uri_tag): nbxmpp.Node.__init__(self, node=uri_tag) - @nested_property - def type_(): + @property + def type_(self): """ uri type """ - def fget(self): - return self.getAttr('type') - - def fset(self, value): - self.setAttr('type', value) + return self.getAttr('type') - def fdel(self): - self.delAttr('type') + @type_.setter + def type_(self, value): + self.setAttr('type', value) - return locals() + @type_.deleter + def type_(self): + self.delAttr('type') - @nested_property - def uri_data(): + @property + def uri_data(self): """ uri data """ - def fget(self): - return self.getData() - - def fset(self, value): - self.setData(value) + return self.getData() - def fdel(self): - self.setData(None) + @uri_data.setter + def uri_data(self, value): + self.setData(value) - return locals() + @uri_data.deleter + def uri_data(self): + self.setData(None) class Media(nbxmpp.Node): def __init__(self, media_tag): nbxmpp.Node.__init__(self, node=media_tag) - @nested_property - def uris(): + @property + def uris(self): """ URIs of the media element. """ - def fget(self): - return map(Uri, self.getTags('uri')) + return map(Uri, self.getTags('uri')) - def fset(self, value): - fdel(self) - for uri in value: - self.addChild(node=uri) + @uris.setter + def uris(self, value): + del self.uris + for uri in value: + self.addChild(node=uri) - def fdel(self): - for element in self.getTags('uri'): - self.delChild(element) - - return locals() + @uris.deleter + def uris(self): + for element in self.getTags('uri'): + self.delChild(element) class BooleanField(DataField): - @nested_property - def value(): # pylint: disable=E0202 + @property + def value(self): """ Value of field. May contain True, False or None """ - def fget(self): - v = self.getTagData('value') - if v in ('0', 'false'): - return False - if v in ('1', 'true'): - return True - if v is None: - return False # default value is False - raise WrongFieldValue - - def fset(self, value): - self.setTagData('value', value and '1' or '0') + v = self.getTagData('value') + if v in ('0', 'false'): + return False + if v in ('1', 'true'): + return True + if v is None: + return False # default value is False + raise WrongFieldValue - def fdel(self, value): - t = self.getTag('value') - if t is not None: - self.delChild(t) + @value.setter + def value(self, value): + self.setTagData('value', value and '1' or '0') - return locals() + @value.deleter + def value(self): + t = self.getTag('value') + if t is not None: + self.delChild(t) class StringField(DataField): """ Covers fields of types: fixed, hidden, text-private, text-single """ - @nested_property - def value(): # pylint: disable=E0202 + @property + def value(self): """ Value of field. May be any string """ - def fget(self): - return self.getTagData('value') or '' - - def fset(self, value): - assert isinstance(value, str) - if value == '' and not self.required: - return fdel(self) - self.setTagData('value', value) + return self.getTagData('value') or '' - def fdel(self): - try: - self.delChild(self.getTag('value')) - except ValueError: # if there already were no value tag - pass + @value.setter + def value(self, value): + assert isinstance(value, str) + if value == '' and not self.required: + del self.value + return + self.setTagData('value', value) - return locals() + @value.deleter + def value(self): + try: + self.delChild(self.getTag('value')) + except ValueError: # if there already were no value tag + pass class ListField(DataField): """ Covers fields of types: jid-multi, jid-single, list-multi, list-single """ - @nested_property - def options(): # pylint: disable=E0202 + @property + def options(self): """ Options """ - def fget(self): - options = [] - for element in self.getTags('option'): - v = element.getTagData('value') - if v is None: - raise WrongFieldValue - l = element.getAttr('label') - if not l: - l = v - options.append((l, v)) - return options - - def fset(self, values): - fdel(self) - for value, label in values: - self.addChild('option', {'label': label}).setTagData('value', value) - - def fdel(self): - for element in self.getTags('option'): - self.delChild(element) - - return locals() + options = [] + for element in self.getTags('option'): + v = element.getTagData('value') + if v is None: + raise WrongFieldValue + l = element.getAttr('label') + if not l: + l = v + options.append((l, v)) + return options + + @options.setter + def options(self, values): + del self.options + for value, label in values: + self.addChild('option', {'label': label}).setTagData('value', value) + + @options.deleter + def options(self): + for element in self.getTags('option'): + self.delChild(element) def iter_options(self): for element in self.iterTags('option'): @@ -438,27 +417,26 @@ class ListMultiField(ListField): Covers list-multi fields """ - @nested_property - def values(): + @property + def values(self): """ Values held in field """ - def fget(self): - values = [] - for element in self.getTags('value'): - values.append(element.getData()) - return values - - def fset(self, values): - fdel(self) - for value in values: - self.addChild('value').setData(value) + values = [] + for element in self.getTags('value'): + values.append(element.getData()) + return values - def fdel(self): - for element in self.getTags('value'): - self.delChild(element) + @values.setter + def values(self, values): + del self.values + for value in values: + self.addChild('value').setData(value) - return locals() + @values.deleter + def values(self): + for element in self.getTags('value'): + self.delChild(element) def iter_values(self): for element in self.getTags('value'): @@ -488,29 +466,28 @@ class JidMultiField(ListMultiField): return True class TextMultiField(DataField): - @nested_property - def value(): # pylint: disable=E0202 + @property + def value(self): """ Value held in field """ - def fget(self): - value = '' - for element in self.iterTags('value'): - value += '\n' + element.getData() - return value[1:] - - def fset(self, value): - fdel(self) - if value == '': - return - for line in value.split('\n'): - self.addChild('value').setData(line) - - def fdel(self): - for element in self.getTags('value'): - self.delChild(element) - - return locals() + value = '' + for element in self.iterTags('value'): + value += '\n' + element.getData() + return value[1:] + + @value.setter + def value(self, value): + del self.value + if value == '': + return + for line in value.split('\n'): + self.addChild('value').setData(line) + + @value.deleter + def value(self): + for element in self.getTags('value'): + self.delChild(element) class DataRecord(ExtendedNode): """ @@ -539,26 +516,25 @@ class DataRecord(ExtendedNode): self.delChild(field) self.fields = fields - @nested_property - def fields(): # pylint: disable=E0202 + @property + def fields(self): """ List of fields in this record """ - def fget(self): - return self.getTags('field') - - def fset(self, fields): - fdel(self) - for field in fields: - if not isinstance(field, DataField): - ExtendField(field) - self.addChild(node=field) + return self.getTags('field') - def fdel(self): - for element in self.getTags('field'): - self.delChild(element) + @fields.setter + def fields(self, fields): + del self.fields + for field in fields: + if not isinstance(field, DataField): + ExtendField(field) + self.addChild(node=field) - return locals() + @fields.deleter + def fields(self): + for element in self.getTags('field'): + self.delChild(element) def iter_fields(self): """ @@ -597,68 +573,64 @@ class DataForm(ExtendedNode): if instructions is not None: self.instructions=instructions - @nested_property - def type_(): # pylint: disable=E0202 + @property + def type_(self): """ Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'. 'form' - this form is to be filled in; you will be able soon to do: filledform = DataForm(replyto=thisform) """ - def fget(self): - return self.getAttr('type') - - def fset(self, type_): - assert type_ in ('form', 'submit', 'cancel', 'result') - self.setAttr('type', type_) + return self.getAttr('type') - return locals() + @type_.setter + def type_(self, type_): + assert type_ in ('form', 'submit', 'cancel', 'result') + self.setAttr('type', type_) - @nested_property - def title(): # pylint: disable=E0202 + @property + def title(self): """ Title of the form Human-readable, should not contain any \\r\\n. """ - def fget(self): - return self.getTagData('title') + return self.getTagData('title') - def fset(self, title): - self.setTagData('title', title) + @title.setter + def title(self, title): + self.setTagData('title', title) - def fdel(self): - try: - self.delChild('title') - except ValueError: - pass - - return locals() + @title.deleter + def title(self): + try: + self.delChild('title') + except ValueError: + pass - @nested_property - def instructions(): # pylint: disable=E0202 + @property + def instructions(self): """ Instructions for this form Human-readable, may contain \\r\\n. """ # TODO: the same code is in TextMultiField. join them - def fget(self): - value = '' - for valuenode in self.getTags('instructions'): - value += '\n' + valuenode.getData() - return value[1:] - - def fset(self, value): - fdel(self) - if value == '': return - for line in value.split('\n'): - self.addChild('instructions').setData(line) - - def fdel(self): - for value in self.getTags('instructions'): - self.delChild(value) - - return locals() + value = '' + for valuenode in self.getTags('instructions'): + value += '\n' + valuenode.getData() + return value[1:] + + @instructions.setter + def instructions(self, value): + del self.instructions + if value == '': return + for line in value.split('\n'): + self.addChild('instructions').setData(line) + + @instructions.deleter + def instructions(self): + for value in self.getTags('instructions'): + self.delChild(value) class SimpleDataForm(DataForm, DataRecord): def __init__(self, type_=None, title=None, instructions=None, fields=None, \ @@ -711,44 +683,43 @@ class MultipleDataForm(DataForm): reported_tag = self.getTag('reported') self.reported = DataRecord(extend=reported_tag) - @nested_property - def items(): # pylint: disable=E0202 + @property + def items(self): """ A list of all records """ - def fget(self): - return list(self.iter_records()) - - def fset(self, records): - fdel(self) - for record in records: - if not isinstance(record, DataRecord): - DataRecord(extend=record) - self.addChild(node=record) + return list(self.iter_records()) - def fdel(self): - for record in self.getTags('item'): - self.delChild(record) + @items.setter + def items(self, records): + del self.items + for record in records: + if not isinstance(record, DataRecord): + DataRecord(extend=record) + self.addChild(node=record) - return locals() + @items.deleter + def items(self): + for record in self.getTags('item'): + self.delChild(record) def iter_records(self): for record in self.getTags('item'): yield record -# @nested_property -# def reported(): -# """ -# DataRecord that contains descriptions of fields in records -# """ -# def fget(self): -# return self.getTag('reported') -# def fset(self, record): -# try: -# self.delChild('reported') -# except: -# pass +# @property +# def reported(self): +# """ +# DataRecord that contains descriptions of fields in records +# """ +# return self.getTag('reported') +# +# @reported.setter +# def reported(self, record): +# try: +# self.delChild('reported') +# except: +# pass # -# record.setName('reported') -# self.addChild(node=record) -# return locals() +# record.setName('reported') +# self.addChild(node=record) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b4362a8a97ca44374535995c1b343ef01… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/b4362a8a97ca44374535995c1b343ef01… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ignore some pylint errors
by Yann Leboulanger 27 Aug '17

27 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: b4362a8a by Yann Leboulanger at 2017-08-27T21:37:19+02:00 ignore some pylint errors - - - - - 1 changed file: - gajim/common/dataforms.py Changes: ===================================== gajim/common/dataforms.py ===================================== --- a/gajim/common/dataforms.py +++ b/gajim/common/dataforms.py @@ -132,7 +132,7 @@ class DataField(ExtendedNode): self.options = options @nested_property - def type_(): + def type_(): # pylint: disable=E0202 """ Type of field. Recognized values are: 'boolean', 'fixed', 'hidden', 'jid-multi', 'jid-single', 'list-multi', 'list-single', 'text-multi', @@ -152,7 +152,7 @@ class DataField(ExtendedNode): return locals() @nested_property - def var(): + def var(): # pylint: disable=E0202 """ Field identifier """ @@ -169,7 +169,7 @@ class DataField(ExtendedNode): return locals() @nested_property - def label(): + def label(): # pylint: disable=E0202 """ Human-readable field name """ @@ -212,7 +212,7 @@ class DataField(ExtendedNode): return locals() @nested_property - def required(): + def required(): # pylint: disable=E0202 """ Controls whether this field required to fill. Boolean """ @@ -313,7 +313,7 @@ class Media(nbxmpp.Node): class BooleanField(DataField): @nested_property - def value(): + def value(): # pylint: disable=E0202 """ Value of field. May contain True, False or None """ @@ -343,7 +343,7 @@ class StringField(DataField): """ @nested_property - def value(): + def value(): # pylint: disable=E0202 """ Value of field. May be any string """ @@ -370,7 +370,7 @@ class ListField(DataField): """ @nested_property - def options(): + def options(): # pylint: disable=E0202 """ Options """ @@ -489,7 +489,7 @@ class JidMultiField(ListMultiField): class TextMultiField(DataField): @nested_property - def value(): + def value(): # pylint: disable=E0202 """ Value held in field """ @@ -540,7 +540,7 @@ class DataRecord(ExtendedNode): self.fields = fields @nested_property - def fields(): + def fields(): # pylint: disable=E0202 """ List of fields in this record """ @@ -598,7 +598,7 @@ class DataForm(ExtendedNode): self.instructions=instructions @nested_property - def type_(): + def type_(): # pylint: disable=E0202 """ Type of the form. Must be one of: 'form', 'submit', 'cancel', 'result'. 'form' - this form is to be filled in; you will be able soon to do: @@ -614,7 +614,7 @@ class DataForm(ExtendedNode): return locals() @nested_property - def title(): + def title(): # pylint: disable=E0202 """ Title of the form @@ -635,7 +635,7 @@ class DataForm(ExtendedNode): return locals() @nested_property - def instructions(): + def instructions(): # pylint: disable=E0202 """ Instructions for this form @@ -712,7 +712,7 @@ class MultipleDataForm(DataForm): self.reported = DataRecord(extend=reported_tag) @nested_property - def items(): + def items(): # pylint: disable=E0202 """ A list of all records """ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4362a8a97ca44374535995c1b343ef013… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/b4362a8a97ca44374535995c1b343ef013… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make IPython 5 work
by Yann Leboulanger 27 Aug '17

27 Aug '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 46c9e5c6 by Yann Leboulanger at 2017-08-27T21:21:48+02:00 Make IPython 5 work - - - - - 2 changed files: - gajim/gui_interface.py - gajim/ipython_view.py Changes: ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -2556,7 +2556,7 @@ class Interface: @staticmethod def create_ipython_window(): try: - from ipython_view import IPythonView + from gajim.ipython_view import IPythonView except ImportError: print('ipython_view not found') return ===================================== gajim/ipython_view.py ===================================== --- a/gajim/ipython_view.py +++ b/gajim/ipython_view.py @@ -59,6 +59,24 @@ try: except ImportError: IPython = None +HAS_IPYTHON5 = True +try: + from pygments.token import Token + from IPython.core.displayhook import DisplayHook + from IPython.core.display_trap import DisplayTrap + + class MyPromptDisplayHook(DisplayHook): + def __init__(self, shell, view): + DisplayHook.__init__(self, shell=shell) + self.view = view + + def write_output_prompt(self): + tokens = self.shell.prompts.out_prompt_tokens() + self.view.write('\n') + self.view.write(tokens) +except Exception: + HAS_IPYTHON5 = False + class IterableIPShell: """ Create an IPython instance. Does not start a blocking event loop, @@ -114,7 +132,11 @@ class IterableIPShell: os.environ['TERM'] = 'dumb' excepthook = sys.excepthook - from IPython.config.loader import Config + if IPython.version_info[0] >= 5: + from traitlets.config.loader import Config + else: + from IPython.config.loader import Config + cfg = Config() cfg.InteractiveShell.colors = "Linux" @@ -125,7 +147,7 @@ class IterableIPShell: # InteractiveShell inherits from SingletonConfigurable so use instance() if IPython.version_info[0] >= 1: - self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) + self.IP = IPython.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns, user_module=user_global_ns) else: self.IP = IPython.frontend.terminal.embed.InteractiveShellEmbed.instance(config=cfg, user_ns=user_ns) @@ -144,7 +166,7 @@ class IterableIPShell: self.complete_sep = re.compile('[\s\{\}\[\]]') self.updateNamespace({'exit':lambda:None}) self.updateNamespace({'quit':lambda:None}) - self.IP.readline_startup_hook(self.IP.pre_readline) + #self.IP.readline_startup_hook(self.IP.pre_readline) # Workaround for updating namespace with sys.modules # self.__update_namespace() @@ -206,6 +228,7 @@ class IterableIPShell: sys.stdout = orig_stdout sys.stdin = orig_stdin + def generatePrompt(self, is_continuation): ''' Generate prompt depending on is_continuation value @@ -217,17 +240,24 @@ class IterableIPShell: @rtype: string ''' - # Backwards compatibility with ipyton-0.11 # ver = IPython.__version__ if '0.11' in ver: prompt = self.IP.hooks.generate_prompt(is_continuation) else: - if is_continuation: - prompt = self.IP.prompt_manager.render('in2') - else: - prompt = self.IP.prompt_manager.render('in') + # Prompt for IPython >=5.0: + if hasattr(self.IP, 'prompts'): + if is_continuation: + prompt = self.IP.prompts.continuation_prompt_tokens(self.IP.prompts) + else: + prompt = self.IP.prompts.in_prompt_tokens(self.IP.prompts) + # Prompt for IPython < 5.0 + elif hasattr(self.IP, 'prompt_manager'): + if is_continuation: + prompt = self.IP.prompt_manager.render('in2') + else: + prompt = self.IP.prompt_manager.render('in') return prompt @@ -319,27 +349,6 @@ class IterableIPShell: return completed, possibilities[1] - def shell(self, cmd,verbose=0,debug=0,header=''): - """ - Replacement method to allow shell commands without them blocking - - @param cmd: Shell command to execute. - @type cmd: string - @param verbose: Verbosity - @type verbose: integer - @param debug: Debug level - @type debug: integer - @param header: Header to be printed before output - @type header: string - """ - if verbose or debug: print(header+cmd) - # flush stdout so we don't mangle python's buffering - if not debug: - input_, output = os.popen4(cmd) - print(output.read()) - output.close() - input_.close() - class ConsoleView(Gtk.TextView): """ Specialized text view for console-like workflow @@ -384,13 +393,47 @@ class ConsoleView(Gtk.TextView): self.text_buffer.create_tag('0') self.text_buffer.create_tag('notouch', editable=False) self.color_pat = re.compile('\x01?\x1b\[(.*?)m\x02?') + if HAS_IPYTHON5: + self.style_dict = { + Token.Prompt: '0;32', + Token.PromptNum: '1;32', + Token.OutPrompt: '0;31', + Token.OutPromptNum: '1;31', + } self.line_start = \ self.text_buffer.create_mark('line_start', self.text_buffer.get_end_iter(), True) self.connect('key-press-event', self.onKeyPress) def write(self, text, editable=False): - GLib.idle_add(self._write, text, editable) + if type(text) == str: + GLib.idle_add(self._write, text, editable) + elif IPython.version_info[0] >= 5: + GLib.idle_add(self._write5, text, editable) + + def _write5(self, text, editable=False): + """ + Write given text to buffer + + @param text: Text to append. + @type text: list of (token: string) + @param editable: If true, added text is editable. + @type editable: boolean + """ + start_mark = self.text_buffer.create_mark(None, + self.text_buffer.get_end_iter(), + True) + + 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) + if not editable: + self.text_buffer.apply_tag_by_name('notouch', + self.text_buffer.get_iter_at_mark(start_mark), + self.text_buffer.get_end_iter()) + self.text_buffer.delete_mark(start_mark) + self.scroll_mark_onscreen(self.mark) def _write(self, text, editable=False): """ @@ -401,6 +444,9 @@ 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: + self._write5(text, editable) + return segments = self.color_pat.split(text) segment = segments.pop(0) start_mark = self.text_buffer.create_mark(None, @@ -555,6 +601,10 @@ class IPythonView(ConsoleView, IterableIPShell): self.cout = StringIO() IterableIPShell.__init__(self, cout=self.cout, cerr=self.cout, input_func=self.raw_input) + if HAS_IPYTHON5: + displayhook = MyPromptDisplayHook(shell=self.IP, view=self) + self.IP.displayhook = displayhook + self.IP.display_trap = DisplayTrap(hook=displayhook) # self.connect('key_press_event', self.keyPress) self.interrupt = False self.execute() @@ -562,6 +612,10 @@ class IPythonView(ConsoleView, IterableIPShell): self.cout.truncate(0) self.showPrompt(self.prompt) + def prompt_for_code(self): + # IPython 5.0 calls prompt_for_code instead of raw_input + return self.raw_input(self) + def raw_input(self, prompt=''): """ Custom raw_input() replacement. Get's current line from console buffer View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/46c9e5c6794c6641467d2b716c8a30691b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/46c9e5c6794c6641467d2b716c8a30691b… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits August 2017