Yann Leboulanger pushed to branch master at gajim / gajim

Commits: 6d868546 by Yann Leboulanger at 2018-04-07T22:48:38+02:00 update action when creating groupchat window. Fixes #9042

- - - - - 879e0344 by Yann Leboulanger at 2018-04-07T23:06:48+02:00 fix some py2->py3 missing things. Fixes #9019

- - - - -

5 changed files:

- gajim/common/file_props.py - gajim/common/rst_xhtml_generator.py - gajim/groupchat_control.py - − scripts/dev/run-build-test.py - scripts/dev/run-pylint.py

Changes:

===================================== gajim/common/file_props.py ===================================== --- a/gajim/common/file_props.py +++ b/gajim/common/file_props.py @@ -3,13 +3,13 @@ This module is in charge of taking care of all the infomation related to individual files. Files are identified by the account name and its sid.

->>> print FilesProp.getFileProp('jabberid', '10') +>>> print(FilesProp.getFileProp('jabberid', '10')) None

...

...

fp = FilesProp()

Traceback (most recent call last): ... Exception: this class should not be instatiated ->>> print FilesProp.getAllFileProp() +>>> print(FilesProp.getAllFileProp()) []

...

...

fp = FilesProp.getNewFileProp('jabberid', '10') fp2 = FilesProp.getFileProp('jabberid', '10')

===================================== gajim/common/rst_xhtml_generator.py ===================================== --- a/gajim/common/rst_xhtml_generator.py +++ b/gajim/common/rst_xhtml_generator.py @@ -153,7 +153,7 @@ if __name__ == '__main__': print("test 1\n" + Generator.create_xhtml(""" test::

->>> print 1 +>>> print(1) 1

*I* like it. It is for :JEP:`71`

===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -335,6 +335,7 @@ class GroupchatControl(ChatControlBase): # Tooltip Window and Actions have to be created with parent self.set_tooltip() self.add_actions() + GLib.idle_add(self.update_actions) self.scale_factor = parent_win.window.get_scale_factor() self._connect_window_state_change(parent_win) else:

===================================== scripts/dev/run-build-test.py deleted ===================================== --- a/scripts/dev/run-build-test.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -import os -import sys - -if os.getcwd().endswith('dev'): - os.chdir('../../') # we were in scripts/dev - -ret = 0 -ret += os.system("make clean > " + os.devnull) -ret += os.system("make > " + os.devnull) -ret += os.system("make check > " + os.devnull) - -if ret == 0: - print "Build successfull" - sys.exit(0) -else: - print >>sys.stderr, "Build failed" - sys.exit(1)

===================================== scripts/dev/run-pylint.py ===================================== --- a/scripts/dev/run-pylint.py +++ b/scripts/dev/run-pylint.py @@ -1,5 +1,6 @@ -#!/usr/bin/env python -# (C) 2006 Nikos Kouremenos kourem@gmail.com +#!/usr/bin/env python3 +# Copyright (C) 2006 Nikos Kouremenos kourem@gmail.com +# Copyright (C) 2016 Yann Leboulanger <asterix AT lagaule.org>

import os import sys @@ -7,4 +8,4 @@ import sys if os.getcwd().endswith('dev'): os.chdir('../../gajim/') # we were in scripts/dev

-os.system("pylint --include-ids=y --additional-builtins='_' --disable-msg=C0103,C0111,W0703,W0511,W0142,W0613,R0201 --disable-checker=design " + "".join(sys.argv[1:])) +os.system("pylint3 --generated-members= --additional-builtins='_' --disable=C0103,C0111,W0703,W0511,W0142,W0613,R0201,design " + "".join(sys.argv[1:]))

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e45856b030f29e0ccf7c55e9923d4cc9...

--- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/27e45856b030f29e0ccf7c55e9923d4cc9... You're receiving this email because of your account on dev.gajim.org.