Commits

commits@gajim.org

17632 discussions

gajim-plugins: OMEMO GTK3 inital
by Gajim Plugins 28 Aug '16

28 Aug '16

changeset a40bef42a250 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: gtk3 details:gajim-plugins?cmd=changeset;node=a40bef42a250 description: OMEMO GTK3 inital diffstat: omemo/.pylintrc | 379 +++++++++++++++ omemo/.style.yapf | 4 + omemo/CHANGELOG | 80 +++ omemo/COPYING | 674 ++++++++++++++++++++++++++ omemo/README.md | 90 +++ omemo/__init__.py | 883 +++++++++++++++++++++++++++++++++++ omemo/config_dialog.ui | 417 ++++++++++++++++ omemo/fpr_dialog.ui | 298 +++++++++++ omemo/manifest.ini | 11 + omemo/omemo.png | Bin omemo/omemo/__init__.py | 1 + omemo/omemo/aes_gcm.py | 42 + omemo/omemo/aes_gcm_fallback.py | 152 ++++++ omemo/omemo/aes_gcm_native.py | 61 ++ omemo/omemo/db_helpers.py | 15 + omemo/omemo/encryption.py | 64 ++ omemo/omemo/liteaxolotlstore.py | 168 ++++++ omemo/omemo/liteidentitykeystore.py | 167 ++++++ omemo/omemo/liteprekeystore.py | 87 +++ omemo/omemo/litesessionstore.py | 130 +++++ omemo/omemo/litesignedprekeystore.py | 113 ++++ omemo/omemo/sql.py | 147 +++++ omemo/omemo/state.py | 412 ++++++++++++++++ omemo/omemo16x16.png | Bin omemo/pkgs/PKGBUILD | 24 + omemo/setup.cfg | 2 + omemo/ui.py | 619 ++++++++++++++++++++++++ omemo/xmpp.py | 346 +++++++++++++ 28 files changed, 5386 insertions(+), 0 deletions(-) diffs (truncated from 5494 to 300 lines): diff -r b435f0133a68 -r a40bef42a250 omemo/.pylintrc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/omemo/.pylintrc Sun Aug 28 23:26:56 2016 +0200 @@ -0,0 +1,379 @@ +[MASTER] + +# Specify a configuration file. +#rcfile= + +# Python code to execute, usually for sys.path manipulation such as +# pygtk.require(). +#init-hook= + +# Add files or directories to the blacklist. They should be base names, not +# paths. +ignore=CVS + +# Pickle collected data for later comparisons. +persistent=yes + +# List of plugins (as comma separated values of python modules names) to load, +# usually to register additional checkers. +load-plugins= + +# Use multiple processes to speed up Pylint. +jobs=1 + +# Allow loading of arbitrary C extensions. Extensions are imported into the +# active Python interpreter and may run arbitrary code. +unsafe-load-any-extension=no + +# A comma-separated list of package or module names from where C extensions may +# be loaded. Extensions are loading into the active Python interpreter and may +# run arbitrary code +extension-pkg-whitelist= + +# Allow optimization of some AST trees. This will activate a peephole AST +# optimizer, which will apply various small optimizations. For instance, it can +# be used to obtain the result of joining multiple strings with the addition +# operator. Joining a lot of strings can lead to a maximum recursion error in +# Pylint and this flag can prevent that. It has one side effect, the resulting +# AST will be different than the one from reality. +optimize-ast=no + + +[MESSAGES CONTROL] + +# Only show warnings with the listed confidence levels. Leave empty to show +# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED +confidence= + +# Enable the message, report, category or checker with the given id(s). You can +# either give multiple identifier separated by comma (,) or put this option +# multiple time (only on the command line, not in the configuration file where +# it should appear only once). See also the "--disable" option for examples. +#enable= + +# Disable the message, report, category or checker with the given id(s). You +# can either give multiple identifiers separated by comma (,) or put this +# option multiple times (only on the command line, not in the configuration +# file where it should appear only once).You can also use "--disable=all" to +# disable everything first and then reenable specific checks. For example, if +# you want to run only the similarities checker, you can use "--disable=all +# --enable=similarities". If you want to run only the classes checker, but have +# no Warning level messages displayed, use"--disable=all --enable=classes +# --disable=W" +disable=import-star-module-level,old-octal-literal,oct-method,print-statement,unpacking-in-except,parameter-unpacking,backtick,old-raise-syntax,old-ne-operator,long-suffix,dict-view-method,dict-iter-method,metaclass-assignment,next-method-called,raising-string,indexing-exception,raw_input-builtin,long-builtin,file-builtin,execfile-builtin,coerce-builtin,cmp-builtin,buffer-builtin,basestring-builtin,apply-builtin,filter-builtin-not-iterating,using-cmp-argument,useless-suppression,range-builtin-not-iterating,suppressed-message,no-absolute-import,old-division,cmp-method,reload-builtin,zip-builtin-not-iterating,intern-builtin,unichr-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,input-builtin,round-builtin,hex-method,nonzero-method,map-builtin-not-iterating + + +[REPORTS] + +# Set the output format. Available formats are text, parseable, colorized, msvs +# (visual studio) and html. You can also give a reporter class, eg +# mypackage.mymodule.MyReporterClass. +output-format=text + +# Put messages in a separate file for each module / package specified on the +# command line instead of printing them on stdout. Reports (if any) will be +# written in a file name "pylint_global.[txt|html]". +files-output=no + +# Tells whether to display a full report or only the messages +reports=yes + +# Python expression which should return a note less than 10 (10 is the highest +# note). You have access to the variables errors warning, statement which +# respectively contain the number of errors / warnings messages and the total +# number of statements analyzed. This is used by the global evaluation report +# (RP0004). +evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10) + +# Template used to display messages. This is a python new-style format string +# used to format the message information. See doc for all details +#msg-template= + + +[BASIC] + +# List of builtins function names that should not be used, separated by a comma +bad-functions=map,filter,input + +# Good variable names which should always be accepted, separated by a comma +good-names=i,j,k,e,Run,_,log,ui,iq,db + +# Bad variable names which should always be refused, separated by a comma +bad-names=foo,bar,baz,toto,tutu,tata + +# Colon-delimited sets of names that determine each other's naming style when +# the name regexes allow several styles. +name-group= + +# Include a hint for the correct naming format with invalid-name +include-naming-hint=no + +# Regular expression matching correct function names +function-rgx=[a-z_][a-z0-9_]{2,30}$ + +# Naming hint for function names +function-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression matching correct variable names +variable-rgx=[a-z_][a-z0-9_]{2,30}$ + +# Naming hint for variable names +variable-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression matching correct constant names +const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$ + +# Naming hint for constant names +const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$ + +# Regular expression matching correct attribute names +attr-rgx=[a-z_][a-z0-9_]{2,30}$ + +# Naming hint for attribute names +attr-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression matching correct argument names +argument-rgx=[a-z_][a-z0-9_]{2,30}$ + +# Naming hint for argument names +argument-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression matching correct class attribute names +class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ + +# Naming hint for class attribute names +class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$ + +# Regular expression matching correct inline iteration names +inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ + +# Naming hint for inline iteration names +inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$ + +# Regular expression matching correct class names +class-rgx=[A-Z_][a-zA-Z0-9]+$ + +# Naming hint for class names +class-name-hint=[A-Z_][a-zA-Z0-9]+$ + +# Regular expression matching correct module names +module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ + +# Naming hint for module names +module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$ + +# Regular expression matching correct method names +method-rgx=[a-z_][a-z0-9_]{2,30}$ + +# Naming hint for method names +method-name-hint=[a-z_][a-z0-9_]{2,30}$ + +# Regular expression which should only match function or class names that do +# not require a docstring. +no-docstring-rgx=^_ + +# Minimum line length for functions/classes that require docstrings, shorter +# ones are exempt. +docstring-min-length=-1 + + +[ELIF] + +# Maximum number of nested blocks for function / method body +max-nested-blocks=5 + + +[FORMAT] + +# Maximum number of characters on a single line. +max-line-length=100 + +# Regexp for a line that is allowed to be longer than the limit. +ignore-long-lines=^\s*(# )?<?https?://\S+>?$ + +# Allow the body of an if to be on the same line as the test if there is no +# else. +single-line-if-stmt=no + +# List of optional constructs for which whitespace checking is disabled. `dict- +# separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. +# `trailing-comma` allows a space between comma and closing bracket: (a, ). +# `empty-line` allows space-only lines. +no-space-check=trailing-comma,dict-separator + +# Maximum number of lines in a module +max-module-lines=1000 + +# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1 +# tab). +indent-string=' ' + +# Number of spaces of indent required inside a hanging or continued line. +indent-after-paren=4 + +# Expected format of line ending, e.g. empty (any line ending), LF or CRLF. +expected-line-ending-format= + + +[LOGGING] + +# Logging modules to check that the string format arguments are in logging +# function parameter format +logging-modules=logging + + +[MISCELLANEOUS] + +# List of note tags to take in consideration, separated by a comma. +notes=FIXME,XXX,TODO + + +[SIMILARITIES] + +# Minimum lines number of a similarity. +min-similarity-lines=4 + +# Ignore comments when computing similarities. +ignore-comments=yes + +# Ignore docstrings when computing similarities. +ignore-docstrings=yes + +# Ignore imports when computing similarities. +ignore-imports=no + + +[SPELLING] + +# Spelling dictionary name. Available dictionaries: none. To make it working +# install python-enchant package. +spelling-dict= + +# List of comma separated words that should not be checked. +spelling-ignore-words= + +# A path to a file that contains private dictionary; one word per line. +spelling-private-dict-file= + +# Tells whether to store unknown words to indicated private dictionary in +# --spelling-private-dict-file option instead of raising a message. +spelling-store-unknown-words=no + + +[TYPECHECK] + +# Tells whether missing members accessed in mixin class should be ignored. A +# mixin class is detected if its name ends with "mixin" (case insensitive). +ignore-mixin-members=yes + +# List of module names for which member attributes should not be checked +# (useful for modules/projects where namespaces are manipulated during runtime +# and thus existing member attributes cannot be deduced by static analysis. It +# supports qualified module names, as well as Unix pattern matching. +ignored-modules= + +# List of classes names for which member attributes should not be checked +# (useful for classes with attributes dynamically set). This supports can work +# with qualified names. +ignored-classes= + +# List of members which are set dynamically and missed by pylint inference +# system, and so shouldn't trigger E1101 when accessed. Python regular +# expressions are accepted. +generated-members= + + +[VARIABLES] + +# Tells whether we should check for unused import in __init__ files. +init-import=no + +# A regular expression matching the name of dummy variables (i.e. expectedly +# not used). +dummy-variables-rgx=_$|dummy + +# List of additional names supposed to be defined in builtins. Remember that +# you should avoid to define new builtins when possible.

1 0

gajim: Output gajim version readably in case of incompatibility
by Gajim 28 Aug '16

28 Aug '16

changeset 6c81b4366b3d in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=6c81b4366b3d description: Output gajim version readably in case of incompatibility diffstat: src/plugins/pluginmanager.py | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diffs (34 lines): diff -r 4cf1ee5092a7 -r 6c81b4366b3d src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Aug 08 15:12:28 2016 +0200 +++ b/src/plugins/pluginmanager.py Sat Aug 20 00:39:45 2016 +0200 @@ -32,7 +32,7 @@ import zipfile from shutil import rmtree import configparser -import pkg_resources +from pkg_resources import parse_version from common import gajim from common import nec @@ -454,9 +454,10 @@ min_v = conf.get('info', 'min_gajim_version', fallback=None) max_v = conf.get('info', 'max_gajim_version', fallback=None) - gajim_v = pkg_resources.parse_version(gajim.config.get('version')) + gajim_v = gajim.config.get('version') + gajim_v_cmp = parse_version(gajim_v) - if min_v and gajim_v < pkg_resources.parse_version(min_v): + if min_v and gajim_v_cmp < parse_version(min_v): log.warning(('Plugin {plugin} not loaded, newer version of' 'gajim required: {gajim_v} < {min_v}').format( plugin=elem_name, @@ -464,7 +465,7 @@ min_v=min_v )) continue - if max_v and gajim_v > pkg_resources.parse_version(max_v): + if max_v and gajim_v_cmp > parse_version(max_v): log.warning(('Plugin {plugin} not loaded, plugin incompatible ' 'with current version of gajim: ' '{gajim_v} > {max_v}').format(

1 0

gajim: Fix Send button layout
by Gajim 28 Aug '16

28 Aug '16

changeset 2e4557e538fe in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=2e4557e538fe description: Fix Send button layout diffstat: data/gui/chat_control.ui | 1 + data/gui/groupchat_control.ui | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diffs (22 lines): diff -r 6c81b4366b3d -r 2e4557e538fe data/gui/chat_control.ui --- a/data/gui/chat_control.ui Sat Aug 20 00:39:45 2016 +0200 +++ b/data/gui/chat_control.ui Mon Aug 22 10:45:40 2016 +0200 @@ -988,6 +988,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">15</property> </packing> </child> diff -r 6c81b4366b3d -r 2e4557e538fe data/gui/groupchat_control.ui --- a/data/gui/groupchat_control.ui Sat Aug 20 00:39:45 2016 +0200 +++ b/data/gui/groupchat_control.ui Mon Aug 22 10:45:40 2016 +0200 @@ -417,6 +417,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">11</property> </packing> </child>

1 0

gajim: Include traceback in exception logging for plugin load
by Gajim 28 Aug '16

28 Aug '16

changeset 978573139f4b in /home/hg/repos/gajim author: Linus Heckemann <git(a)sphalerite.org> branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=978573139f4b description: Include traceback in exception logging for plugin load diffstat: src/plugins/pluginmanager.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (14 lines): diff -r 2e4557e538fe -r 978573139f4b src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Mon Aug 22 10:45:40 2016 +0200 +++ b/src/plugins/pluginmanager.py Sat Aug 20 00:35:57 2016 +0200 @@ -484,8 +484,8 @@ module = __import__(module_name) except Exception as error: log.warning( - "While trying to load {plugin}, exception occurred: {error}" - .format(plugin=elem_name, error=str(error)) + "While trying to load {plugin}, exception occurred".format(plugin=elem_name), + exc_info=sys.exc_info() ) continue

1 0

gajim: add new event for gc after message stanza is built so it ...
by Gajim 28 Aug '16

28 Aug '16

changeset c736e7a257be in /home/hg/repos/gajim author: lovetox branches: gajim_0.16 details:http://hg.gajim.org/gajim?cmd=changeset;node=c736e7a257be description: add new event for gc after message stanza is built so it can be modified by plugins diffstat: src/common/connection.py | 39 ++++++++++++++++++++++--------- src/common/connection_handlers_events.py | 7 +++++ 2 files changed, 35 insertions(+), 11 deletions(-) diffs (104 lines): diff -r b1567f3877c9 -r c736e7a257be src/common/connection.py --- a/src/common/connection.py Tue Aug 02 14:09:22 2016 +0100 +++ b/src/common/connection.py Fri Jun 24 20:12:37 2016 +0200 @@ -54,7 +54,8 @@ PlainConnectionEvent, PrivacyListReceivedEvent, PrivacyListActiveDefaultEvent, \ PrivacyListsReceivedEvent, RegisterAgentInfoReceivedEvent, NewAccountConnectedEvent, \ AccountCreatedEvent, AccountNotCreatedEvent, BeforeChangeShowEvent, StanzaSentEvent, \ - StanzaReceivedEvent, MessageNotSentEvent, GPGTrustKeyEvent, BadGPGPassphraseEvent + StanzaReceivedEvent, MessageNotSentEvent, GPGTrustKeyEvent, BadGPGPassphraseEvent, \ + GcStanzaMessageOutgoingEvent from common.connection_handlers_events import InsecurePasswordEvent, MessageSentEvent, \ NonAnonymousServerErrorEvent, Oauth2CredentialsRequiredEvent, PasswordRequiredEvent, \ RosterReceivedEvent, SearchResultReceivedEvent @@ -830,6 +831,8 @@ self._nec_message_outgoing) gajim.ged.register_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.register_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, + self._nec_gc_stanza_message_outgoing) gajim.ged.register_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) # END __init__ @@ -846,6 +849,8 @@ self._nec_message_outgoing) gajim.ged.remove_event_handler('gc-message-outgoing', ged.OUT_CORE, self._nec_gc_message_outgoing) + gajim.ged.remove_event_handler('gc-stanza-message-outgoing', ged.OUT_CORE, + self._nec_gc_stanza_message_outgoing) gajim.ged.remove_event_handler('stanza-message-outgoing', ged.OUT_CORE, self._nec_stanza_message_outgoing) @@ -2733,16 +2738,16 @@ if obj.correction_msg.getTag('replace'): obj.correction_msg.delChild('replace') obj.correction_msg.setTag('replace', attrs={'id': id_}, - namespace=nbxmpp.NS_CORRECT) + namespace=nbxmpp.NS_CORRECT) id2 = self.connection.getAnID() obj.correction_msg.setID(id2) obj.correction_msg.setBody(obj.message) if obj.xhtml: obj.correction_msg.setXHTML(xhtml) - obj.msg_id = self.connection.send(obj.correction_msg) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None, - automatic_message=obj.automatic_message, msg_id=obj.msg_id)) + gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( + None, conn=self, automatic_message=obj.automatic_message, + jid=obj.jid, message=obj.message, + correction_msg=obj.correction_msg)) if obj.callback: obj.callback(obj.correction_msg, obj.message) return @@ -2750,16 +2755,28 @@ from common.rst_xhtml_generator import create_xhtml obj.xhtml = create_xhtml(obj.message) msg_iq = nbxmpp.Message(obj.jid, obj.message, typ='groupchat', - xhtml=obj.xhtml) + xhtml=obj.xhtml) if obj.label is not None: msg_iq.addChild(node=obj.label) - obj.msg_id = self.connection.send(msg_iq) - gajim.nec.push_incoming_event(MessageSentEvent(None, conn=self, - jid=obj.jid, message=obj.message, keyID=None, chatstate=None, - automatic_message=obj.automatic_message, msg_id=obj.msg_id)) + gajim.nec.push_incoming_event(GcStanzaMessageOutgoingEvent( + None, conn=self, msg_iq=msg_iq, + automatic_message=obj.automatic_message, + jid=obj.jid, message=obj.message, correction_msg=None)) if obj.callback: obj.callback(msg_iq, obj.message) + def _nec_gc_stanza_message_outgoing(self, obj): + if obj.conn.name != self.name: + return + if obj.correction_msg: + obj.msg_id = self.connection.send(obj.correction_msg) + else: + obj.msg_id = self.connection.send(obj.msg_iq) + gajim.nec.push_incoming_event(MessageSentEvent( + None, conn=self, jid=obj.jid, message=obj.message, keyID=None, + chatstate=None, automatic_message=obj.automatic_message, + msg_id=obj.msg_id)) + def send_gc_subject(self, jid, subject): if not gajim.account_is_connected(self.name): return diff -r b1567f3877c9 -r c736e7a257be src/common/connection_handlers_events.py --- a/src/common/connection_handlers_events.py Tue Aug 02 14:09:22 2016 +0100 +++ b/src/common/connection_handlers_events.py Fri Jun 24 20:12:37 2016 +0200 @@ -2668,6 +2668,13 @@ def generate(self): return True +class GcStanzaMessageOutgoingEvent(nec.NetworkOutgoingEvent): + name='gc-stanza-message-outgoing' + base_network_events = [] + + def generate(self): + return True + class GcMessageOutgoingEvent(nec.NetworkOutgoingEvent): name = 'gc-message-outgoing' base_network_events = []

1 0

gajim-plugins: Correction: Dont handle groupchat messages
by Gajim Plugins 26 Aug '16

26 Aug '16

changeset 26ac702fc014 in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=26ac702fc014 description: Correction: Dont handle groupchat messages diffstat: gotr/otrmodule.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r a9323a8dd51a -r 26ac702fc014 gotr/otrmodule.py --- a/gotr/otrmodule.py Thu Aug 25 19:15:17 2016 +0200 +++ b/gotr/otrmodule.py Fri Aug 26 20:48:44 2016 +0200 @@ -254,6 +254,7 @@ def otr_dialog_destroy(widget, *args, **kwargs): widget.destroy() + class OtrPlugin(GajimPlugin): otr = None def init(self):

1 0

gajim-plugins: Handle only groupchat messages
by Gajim Plugins 25 Aug '16

25 Aug '16

changeset a9323a8dd51a in /home/hg/repos/gajim-plugins author: lovetox <forenjunkie(a)chelo.at> branches: details:gajim-plugins?cmd=changeset;node=a9323a8dd51a description: Handle only groupchat messages diffstat: gotr/manifest.ini | 2 +- gotr/otrmodule.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diffs (25 lines): diff -r ca04362cf27e -r a9323a8dd51a gotr/manifest.ini --- a/gotr/manifest.ini Fri Aug 05 21:05:01 2016 +0200 +++ b/gotr/manifest.ini Thu Aug 25 19:15:17 2016 +0200 @@ -1,7 +1,7 @@ [info] name: Off-The-Record Encryption short_name: gotr -version: 1.9.3 +version: 1.9.4 description: Provide OTR encryption. Read <a href="https://github.com/python-otr/gajim-otr/wiki">https://github.com/python-otr/gajim-otr/wiki</a> before use. authors: Kjell Braden <afflux.gajim(a)pentabarf.de> homepage: http://gajim-otr.pentabarf.de diff -r ca04362cf27e -r a9323a8dd51a gotr/otrmodule.py --- a/gotr/otrmodule.py Fri Aug 05 21:05:01 2016 +0200 +++ b/gotr/otrmodule.py Thu Aug 25 19:15:17 2016 +0200 @@ -551,7 +551,8 @@ accjid = gajim.get_jid_from_account(account) if event.encrypted is not False or not event.stanza.getTag('body') \ - or not isinstance(event.stanza.getBody(), unicode): + or not isinstance(event.stanza.getBody(), unicode) \ + or event.mtype != 'chat': return PASS try:

1 0

gajim-plugins: httpupload: Fix GTK warnings
by Gajim Plugins 22 Aug '16

22 Aug '16

changeset b435f0133a68 in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=b435f0133a68 description: httpupload: Fix GTK warnings Episode 2: no core changes required diffstat: httpupload/httpupload.py | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diffs (78 lines): diff -r 885261472f0d -r b435f0133a68 httpupload/httpupload.py --- a/httpupload/httpupload.py Sat Aug 20 00:30:17 2016 +0200 +++ b/httpupload/httpupload.py Mon Aug 22 15:27:42 2016 +0200 @@ -273,7 +273,8 @@ mime_type = 'application/octet-stream' # fallback mime type log.info("Detected MIME Type of file: " + str(mime_type)) progress_messages = Queue(8) - progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), progress_messages, self.plugin) + progress_window = ProgressWindow(_('HTTP Upload'), _('Requesting HTTP Upload Slot...'), + progress_messages, self.plugin, parent=self.chat_control.parent_win.window) def upload_file(stanza): slot = stanza.getTag("slot") if not slot: @@ -437,10 +438,12 @@ title_text = _('Choose file to send'), action = Gtk.FileChooserAction.OPEN, buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK), default_response = Gtk.ResponseType.OK,) + self.dlg.set_transient_for(self.chat_control.parent_win.window) def on_image_button_clicked(self, widget): self.dialog_type = 'image' self.dlg = ImageChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None) + self.dlg.set_transient_for(self.chat_control.parent_win.window) class StreamFileWithProgress: @@ -490,11 +493,12 @@ class ProgressWindow: - def __init__(self, title_text, during_text, messages_queue, plugin): + def __init__(self, title_text, during_text, messages_queue, plugin, parent): self.plugin = plugin self.xml = gtkgui_helpers.get_gtk_builder(self.plugin.local_file_path('upload_progress_dialog.ui')) self.messages_queue = messages_queue self.dialog = self.xml.get_object('progress_dialog') + self.dialog.set_transient_for(parent) self.label = self.xml.get_object('label') self.cancel_button = self.xml.get_object('close_button') self.label.set_markup('<big>' + during_text + '</big>') @@ -507,8 +511,8 @@ self.xml.connect_signals(self) self.stopped = False - self.pulse_progressbar_timeout_id = GObject.timeout_add(100, self.pulse_progressbar) - self.process_messages_queue_timeout_id = GObject.timeout_add(100, self.process_messages_queue) + self.pulse_progressbar_timeout_id = GLib.timeout_add(100, self.pulse_progressbar) + self.process_messages_queue_timeout_id = GLib.timeout_add(100, self.process_messages_queue) def pulse_progressbar(self): @@ -527,21 +531,21 @@ def on_progress_dialog_delete_event(self, widget, event): self.stopped = True if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) - GObject.source_remove(self.process_messages_queue_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.process_messages_queue_timeout_id) def on_cancel(self, widget): self.stopped = True if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) - GObject.source_remove(self.process_messages_queue_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.process_messages_queue_timeout_id) self.dialog.destroy() def update_progress(self, seen, total): if self.stopped == True: raise UploadAbortedException if self.pulse_progressbar_timeout_id: - GObject.source_remove(self.pulse_progressbar_timeout_id) + GLib.source_remove(self.pulse_progressbar_timeout_id) self.pulse_progressbar_timeout_id = None pct = (float(seen) / total) * 100.0 self.progressbar.set_fraction(float(seen) / total)

1 0

gajim-plugins: Add back HTTP upload
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset 90e748ab1c84 in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=90e748ab1c84 description: Add back HTTP upload diffstat: httpupload/__init__.py | 2 + httpupload/httpupload.py | 660 +++++++++++++++++++++++++++++++++++ httpupload/manifest.ini | 16 + httpupload/upload_progress_dialog.ui | 105 +++++ 4 files changed, 783 insertions(+), 0 deletions(-) diffs (truncated from 799 to 300 lines): diff -r aa7dd59ea9b5 -r 90e748ab1c84 httpupload/__init__.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/__init__.py Thu Aug 18 19:52:31 2016 +0200 @@ -0,0 +1,2 @@ +# simple redirect +from httpupload import HttpuploadPlugin diff -r aa7dd59ea9b5 -r 90e748ab1c84 httpupload/httpupload.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/httpupload/httpupload.py Thu Aug 18 19:52:31 2016 +0200 @@ -0,0 +1,660 @@ +# -*- coding: utf-8 -*- +## + +from common import demandimport +demandimport.enable() +demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] + +import gtk +import gobject +import os +import time +import base64 +import tempfile +import urllib2 +import mimetypes # better use the magic packet, but that's not a standard lib +import gtkgui_helpers +from Queue import Queue +try: + from PIL import Image + pil_available = True +except: + pil_available = False +from io import BytesIO +import base64 +import binascii + +from common import gajim +from common import ged +import chat_control +from plugins import GajimPlugin +from plugins.helpers import log_calls +import logging +from dialogs import FileChooserDialog, ImageChooserDialog, ErrorDialog +import nbxmpp + +log = logging.getLogger('gajim.plugin_system.httpupload') + +if os.name != 'nt': + try: + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers import algorithms + from cryptography.hazmat.primitives.ciphers.modes import GCM + encryption_available = True + except Exception as e: + log.debug(e) + encryption_available = False +else: + encryption_available = False + log.info('Cryptography not available on Windows for now') + +# XEP-0363 (http://xmpp.org/extensions/xep-0363.html) +NS_HTTPUPLOAD = 'urn:xmpp:http:upload' +TAGSIZE = 16 + +jid_to_servers = {} +iq_ids_to_callbacks = {} +last_info_query = {} +max_thumbnail_size = 2048 +max_thumbnail_dimension = 160 + + +class HttpuploadPlugin(GajimPlugin): + + @log_calls('HttpuploadPlugin') + def init(self): + self.config_dialog = None # HttpuploadPluginConfigDialog(self) + self.controls = [] + self.events_handlers = {} + self.events_handlers['agent-info-received'] = (ged.PRECORE, + self.handle_agent_info_received) + self.events_handlers['raw-iq-received'] = (ged.PRECORE, + self.handle_iq_received) + self.gui_extension_points = { + 'chat_control_base': (self.connect_with_chat_control, + self.disconnect_from_chat_control), + 'chat_control_base_update_toolbar': (self.update_button_state, + None)} + self.first_run = True + + def handle_iq_received(self, event): + global iq_ids_to_callbacks + id_ = event.stanza.getAttr("id") + if str(id_) in iq_ids_to_callbacks: + try: + iq_ids_to_callbacks[str(id_)](event.stanza) + except: + raise + finally: + del iq_ids_to_callbacks[str(id_)] + + def handle_agent_info_received(self, event): + global jid_to_servers + if NS_HTTPUPLOAD in event.features and gajim.jid_is_transport(event.jid): + own_jid = gajim.get_jid_without_resource(str(event.stanza.getTo())) + jid_to_servers[own_jid] = event.jid # map own jid to upload component's jid + log.info(own_jid + " can do http uploads via component " + event.jid) + # update all buttons + for base in self.controls: + self.update_button_state(base.chat_control) + + @log_calls('HttpuploadPlugin') + def connect_with_chat_control(self, control): + self.chat_control = control + base = Base(self, self.chat_control) + self.controls.append(base) + if self.first_run: + # ALT + U + gtk.binding_entry_add_signal(control.msg_textview, + gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', + int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) + self.first_run = False + self.update_button_state(self.chat_control) + + @log_calls('HttpuploadPlugin') + def disconnect_from_chat_control(self, chat_control): + for control in self.controls: + control.disconnect_from_chat_control() + self.controls = [] + + @log_calls('HttpuploadPlugin') + def update_button_state(self, chat_control): + global jid_to_servers + global iq_ids_to_callbacks + global last_info_query + + if gajim.connections[chat_control.account].connection == None and \ + gajim.get_jid_from_account(chat_control.account) in jid_to_servers: + # maybe don't delete this and detect vanished upload components when actually trying to upload something + log.info("Deleting %s from jid_to_servers (disconnected)" % gajim.get_jid_from_account(chat_control.account)) + del jid_to_servers[gajim.get_jid_from_account(chat_control.account)] + #pass + + # query info at most every 60 seconds in case something goes wrong + if (not chat_control.account in last_info_query or \ + last_info_query[chat_control.account] + 60 < time.time()) and \ + not gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.account_is_connected(chat_control.account): + log.info("Account %s: Using dicovery to find jid of httpupload component" % chat_control.account) + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#items" + ) + iq.setID(id_) + def query_info(stanza): + global last_info_query + for item in stanza.getTag("query").getTags("item"): + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=item.getAttr("jid"), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + iq_ids_to_callbacks[str(id_)] = query_info + gajim.connections[chat_control.account].connection.send(iq) + #send disco query to main server jid + id_ = gajim.get_an_id() + iq = nbxmpp.Iq( + typ='get', + to=gajim.get_server_from_jid(gajim.get_jid_from_account(chat_control.account)), + queryNS="http://jabber.org/protocol/disco#info" + ) + iq.setID(id_) + last_info_query[chat_control.account] = time.time() + gajim.connections[chat_control.account].connection.send(iq) + + for base in self.controls: + if base.chat_control == chat_control: + is_supported = gajim.get_jid_from_account(chat_control.account) in jid_to_servers and \ + gajim.connections[chat_control.account].connection != None + log.info("Account %s: httpupload is_supported: %s" % (str(chat_control.account), str(is_supported))) + if not is_supported: + text = _('Your server does not support http uploads') + image_text = text + else: + text = _('Send file via http upload') + image_text = _('Send image via http upload') + base.button.set_sensitive(is_supported) + base.button.set_tooltip_text(text) + base.image_button.set_sensitive(is_supported) + base.image_button.set_tooltip_text(image_text) + + +class Base(object): + def __init__(self, plugin, chat_control): + self.dlg = None + self.dialog_type = 'file' + self.keypress_id = chat_control.msg_textview.connect('mykeypress', + self.on_key_press) + self.plugin = plugin + self.encrypted_upload = False + self.chat_control = chat_control + actions_hbox = chat_control.xml.get_object('actions_hbox') + self.button = gtk.Button(label=None, stock=None, use_underline=True) + self.button.set_property('relief', gtk.RELIEF_NONE) + self.button.set_property('can-focus', False) + self.button.set_sensitive(False) + img = gtk.Image() + img.set_from_file(self.plugin.local_file_path('httpupload.png')) + self.button.set_image(img) + self.button.set_tooltip_text(_('Your server does not support http uploads')) + self.image_button = gtk.Button(label=None, stock=None, use_underline=True) + self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.image_button.set_property('can-focus', False) + self.image_button.set_sensitive(False) + img = gtk.Image() + img.set_from_file(self.plugin.local_file_path('image.png')) + self.image_button.set_image(img) + self.image_button.set_tooltip_text(_('Your server does not support http uploads')) + send_button = chat_control.xml.get_object('send_button') + send_button_pos = actions_hbox.child_get_property(send_button, + 'position') + actions_hbox.add_with_properties(self.button, 'position', + send_button_pos - 2, 'expand', False) + + actions_hbox.add_with_properties(self.image_button, 'position', + send_button_pos - 1, 'expand', False) + + file_id = self.button.connect('clicked', self.on_file_button_clicked) + image_id = self.image_button.connect('clicked', self.on_image_button_clicked) + chat_control.handlers[file_id] = self.button + chat_control.handlers[image_id] = self.image_button + chat_control.handlers[self.keypress_id] = chat_control.msg_textview + self.button.show() + self.image_button.show() + + def on_key_press(self, widget, event_keyval, event_keymod): + # construct event instance from binding + event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here + event.keyval = event_keyval + event.state = event_keymod + event.time = 0 # assign current time + + if event.keyval != gtk.keysyms.u: + return + if event.state != gtk.gdk.MOD1_MASK: # ALT+u + return + is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ + gajim.connections[self.chat_control.account].connection != None + if not is_supported: + from dialogs import WarningDialog + WarningDialog('Warning', _('Your server does not support http uploads'), + transient_for=self.chat_control.parent_win.window) + return + self.on_file_button_clicked(widget) + + def disconnect_from_chat_control(self): + actions_hbox = self.chat_control.xml.get_object('actions_hbox') + actions_hbox.remove(self.button) + actions_hbox.remove(self.image_button) + if self.keypress_id in self.chat_control.handlers and \ + self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): + self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) + del self.chat_control.handlers[self.keypress_id] + + def encryption_activated(self): + if not encryption_available: + return False + jid = self.chat_control.contact.jid + account = self.chat_control.account + for plugin in gajim.plugin_manager.active_plugins: + if type(plugin).__name__ == 'OmemoPlugin': + omemo = plugin + break + if omemo: + state = omemo.get_omemo_state(account) + log.info('Encryption is: ' + + str(state.encryption.is_active(jid))) + return state.encryption.is_active(jid) + log.info('Encryption is: False / OMEMO not found') + return False + + def on_file_dialog_ok(self, widget, path_to_file=None): + global jid_to_servers + + try: + self.encrypted_upload = self.encryption_activated() + except Exception as e: + log.debug(e) + self.encrypted_upload = False + + if not path_to_file: + path_to_file = self.dlg.get_filename() + if not path_to_file: + self.dlg.destroy()

1 0

gajim-plugins: Fix httpupload for GTK3
by Gajim Plugins 20 Aug '16

20 Aug '16

changeset 748cc7c1cb4e in /home/hg/repos/gajim-plugins author: Linus Heckemann <git(a)sphalerite.org> branches: gtk3 details:gajim-plugins?cmd=changeset;node=748cc7c1cb4e description: Fix httpupload for GTK3 Not perfect yet, some layout issues remain, but it works. diffstat: httpupload/__init__.py | 2 +- httpupload/httpupload.py | 135 ++++++++++++++++++---------------------------- httpupload/manifest.ini | 2 +- 3 files changed, 54 insertions(+), 85 deletions(-) diffs (truncated from 349 to 300 lines): diff -r 90e748ab1c84 -r 748cc7c1cb4e httpupload/__init__.py --- a/httpupload/__init__.py Thu Aug 18 19:52:31 2016 +0200 +++ b/httpupload/__init__.py Thu Aug 18 20:00:57 2016 +0200 @@ -1,2 +1,2 @@ # simple redirect -from httpupload import HttpuploadPlugin +from .httpupload import HttpuploadPlugin diff -r 90e748ab1c84 -r 748cc7c1cb4e httpupload/httpupload.py --- a/httpupload/httpupload.py Thu Aug 18 19:52:31 2016 +0200 +++ b/httpupload/httpupload.py Thu Aug 18 20:00:57 2016 +0200 @@ -1,20 +1,16 @@ # -*- coding: utf-8 -*- ## -from common import demandimport -demandimport.enable() -demandimport.ignore += ['builtins', '__builtin__', 'PIL','_imp'] - -import gtk -import gobject +from gi.repository import GObject, Gtk import os import time import base64 import tempfile -import urllib2 +from urllib.request import Request, urlopen +from urllib.parse import quote as urlquote import mimetypes # better use the magic packet, but that's not a standard lib import gtkgui_helpers -from Queue import Queue +from queue import Queue try: from PIL import Image pil_available = True @@ -105,10 +101,7 @@ base = Base(self, self.chat_control) self.controls.append(base) if self.first_run: - # ALT + U - gtk.binding_entry_add_signal(control.msg_textview, - gtk.keysyms.u, gtk.gdk.MOD1_MASK, 'mykeypress', - int, gtk.keysyms.u, gtk.gdk.ModifierType, gtk.gdk.MOD1_MASK) + # TODO: Potentially add back keyboard shortcut self.first_run = False self.update_button_state(self.chat_control) @@ -190,73 +183,46 @@ def __init__(self, plugin, chat_control): self.dlg = None self.dialog_type = 'file' - self.keypress_id = chat_control.msg_textview.connect('mykeypress', - self.on_key_press) self.plugin = plugin self.encrypted_upload = False self.chat_control = chat_control actions_hbox = chat_control.xml.get_object('actions_hbox') - self.button = gtk.Button(label=None, stock=None, use_underline=True) - self.button.set_property('relief', gtk.RELIEF_NONE) + self.button = Gtk.Button(label=None, stock=None, use_underline=True) self.button.set_property('can-focus', False) self.button.set_sensitive(False) - img = gtk.Image() + img = Gtk.Image() img.set_from_file(self.plugin.local_file_path('httpupload.png')) self.button.set_image(img) self.button.set_tooltip_text(_('Your server does not support http uploads')) - self.image_button = gtk.Button(label=None, stock=None, use_underline=True) - self.image_button.set_property('relief', gtk.RELIEF_NONE) + self.button.set_relief(Gtk.ReliefStyle.NONE) + self.image_button = Gtk.Button(label=None, stock=None, use_underline=True) self.image_button.set_property('can-focus', False) + self.image_button.set_relief(Gtk.ReliefStyle.NONE) self.image_button.set_sensitive(False) - img = gtk.Image() + img = Gtk.Image() img.set_from_file(self.plugin.local_file_path('image.png')) self.image_button.set_image(img) self.image_button.set_tooltip_text(_('Your server does not support http uploads')) send_button = chat_control.xml.get_object('send_button') - send_button_pos = actions_hbox.child_get_property(send_button, - 'position') - actions_hbox.add_with_properties(self.button, 'position', - send_button_pos - 2, 'expand', False) + actions_hbox.add(self.button) + actions_hbox.add(self.image_button) - actions_hbox.add_with_properties(self.image_button, 'position', - send_button_pos - 1, 'expand', False) + send_button_pos = actions_hbox.child_get_property(send_button, 'position') + actions_hbox.child_set_property(self.image_button, 'position', send_button_pos - 1) + actions_hbox.child_set_property(self.button, 'position', send_button_pos - 1) file_id = self.button.connect('clicked', self.on_file_button_clicked) image_id = self.image_button.connect('clicked', self.on_image_button_clicked) chat_control.handlers[file_id] = self.button chat_control.handlers[image_id] = self.image_button - chat_control.handlers[self.keypress_id] = chat_control.msg_textview self.button.show() self.image_button.show() - def on_key_press(self, widget, event_keyval, event_keymod): - # construct event instance from binding - event = gtk.gdk.Event(gtk.gdk.KEY_PRESS) # it's always a key-press here - event.keyval = event_keyval - event.state = event_keymod - event.time = 0 # assign current time - - if event.keyval != gtk.keysyms.u: - return - if event.state != gtk.gdk.MOD1_MASK: # ALT+u - return - is_supported = gajim.get_jid_from_account(self.chat_control.account) in jid_to_servers and \ - gajim.connections[self.chat_control.account].connection != None - if not is_supported: - from dialogs import WarningDialog - WarningDialog('Warning', _('Your server does not support http uploads'), - transient_for=self.chat_control.parent_win.window) - return - self.on_file_button_clicked(widget) def disconnect_from_chat_control(self): actions_hbox = self.chat_control.xml.get_object('actions_hbox') actions_hbox.remove(self.button) actions_hbox.remove(self.image_button) - if self.keypress_id in self.chat_control.handlers and \ - self.chat_control.handlers[self.keypress_id].handler_is_connected(self.keypress_id): - self.chat_control.handlers[self.keypress_id].disconnect(self.keypress_id) - del self.chat_control.handlers[self.keypress_id] def encryption_activated(self): if not encryption_available: @@ -289,8 +255,6 @@ if not path_to_file: self.dlg.destroy() return - path_to_file = gtkgui_helpers.decode_filechooser_file_paths( - (path_to_file,))[0] self.dlg.destroy() if not os.path.exists(path_to_file): return @@ -321,8 +285,8 @@ def upload_file(stanza): slot = stanza.getTag("slot") if not slot: + log.error("got unexpected stanza: "+str(stanza)) progress_window.close_dialog() - log.error("got unexpected stanza: "+str(stanza)) error = stanza.getTag("error") if error and error.getTag("text"): ErrorDialog(_('Could not request upload slot'), @@ -347,6 +311,7 @@ "rb", progress_window.update_progress) except: + log.error("Could not open file") progress_window.close_dialog() ErrorDialog(_('Could not open file'), _('Exception raised while opening file (see error log for more information)'), @@ -356,8 +321,8 @@ put = slot.getTag("put") get = slot.getTag("get") if not put or not get: + log.error("got unexpected stanza: " + str(stanza)) progress_window.close_dialog() - log.error("got unexpected stanza: " + str(stanza)) ErrorDialog(_('Could not request upload slot'), _('Got unexpected response from server (protocol mismatch??)'), transient_for=self.chat_control.parent_win.window) @@ -377,7 +342,7 @@ thumb = None quality_steps = (100, 80, 60, 50, 40, 35, 30, 25, 23, 20, 18, 15, 13, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1) with open(path_to_file, 'rb') as content_file: - thumb = urllib2.quote(base64.standard_b64encode(content_file.read()), '') + thumb = urlquote(base64.standard_b64encode(content_file.read()), '') if thumb and len(thumb) < max_thumbnail_size: quality = 100 log.info("Image small enough (%d bytes), not resampling" % len(thumb)) @@ -391,7 +356,7 @@ thumb.save(output, format='JPEG', quality=quality, optimize=True) thumb = output.getvalue() output.close() - thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + thumb = urlquote(base64.standard_b64encode(thumb), '') log.debug("pil thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break @@ -405,7 +370,7 @@ try: with open(path_to_file, 'rb') as content_file: thumb = content_file.read() - loader = gtk.gdk.PixbufLoader() + loader = Gtk.gdk.PixbufLoader() loader.write(thumb) loader.close() pixbuf = loader.get_pixbuf() @@ -417,7 +382,7 @@ scaled_pb.save(temp_file, "jpeg", {"quality": str(quality)}) with open(temp_file, 'rb') as content_file: thumb = content_file.read() - thumb = urllib2.quote(base64.standard_b64encode(thumb), '') + thumb = urlquote(base64.standard_b64encode(thumb), '') log.debug("gtk thumbnail jpeg quality %d produces an image of size %d..." % (quality, len(thumb))) if len(thumb) < max_thumbnail_size: break @@ -455,11 +420,12 @@ try: headers = {'User-Agent': 'Gajim %s' % gajim.version, 'Content-Type': mime_type} - request = urllib2.Request(put.getData().encode("utf-8"), data=data, headers=headers) + request = Request(put.getData(), data=data, headers=headers) request.get_method = lambda: 'PUT' - log.debug("opening urllib2 upload request...") - transfer = urllib2.urlopen(request, timeout=30) - log.debug("urllib2 upload request done, response code: " + str(transfer.getcode())) + log.debug("opening urllib upload request...") + transfer = urlopen(request, timeout=30) + data.close() + log.debug("urllib upload request done, response code: " + str(transfer.getcode())) return transfer.getcode() except UploadAbortedException: log.info("Upload aborted") @@ -521,9 +487,9 @@ def on_file_button_clicked(self, widget): self.dialog_type = 'file' self.dlg = FileChooserDialog(on_response_ok=self.on_file_dialog_ok, on_response_cancel=None, - title_text = _('Choose file to send'), action = gtk.FILE_CHOOSER_ACTION_OPEN, - buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_OK), - default_response = gtk.RESPONSE_OK,) + title_text = _('Choose file to send'), action = Gtk.FileChooserAction.OPEN, + buttons = (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.OK), + default_response = Gtk.ResponseType.OK,) def on_image_button_clicked(self, widget): self.dialog_type = 'image' @@ -546,25 +512,25 @@ image_height = int(size) crop_pixbuf = pixbuf.scale_simple(image_width, image_height, - gtk.gdk.INTERP_BILINEAR) + Gtk.gdk.INTERP_BILINEAR) return crop_pixbuf -class StreamFileWithProgress(file): +class StreamFileWithProgress: def __init__(self, path, mode, callback=None, encrypted_upload=False, key=None, iv=None, *args): - file.__init__(self, path, mode) + self.backing = open(path, mode) self.encrypted_upload = encrypted_upload - self.seek(0, os.SEEK_END) + self.backing.seek(0, os.SEEK_END) if self.encrypted_upload: self.encryptor = Cipher( algorithms.AES(key), GCM(iv), backend=default_backend()).encryptor() - self._total = self.tell() + TAGSIZE + self._total = self.backing.tell() + TAGSIZE else: - self._total = self.tell() - self.seek(0) + self._total = self.backing.tell() + self.backing.seek(0) self._callback = callback self._args = args self._seen = 0 @@ -574,7 +540,7 @@ def read(self, size): if self.encrypted_upload: - data = file.read(self, size) + data = self.backing.read(size) if len(data) > 0: data = self.encryptor.update(data) self._seen += len(data) @@ -586,12 +552,15 @@ self._callback(self._seen, self._total, *self._args) return data else: - data = file.read(self, size) + data = self.backing.read(size) self._seen += len(data) if self._callback: self._callback(self._seen, self._total, *self._args) return data + def close(self): + return self.backing.close() + class ProgressWindow: def __init__(self, title_text, during_text, messages_queue, plugin): @@ -605,14 +574,14 @@ self.progressbar = self.xml.get_object('progressbar') self.progressbar.set_text("") self.dialog.set_title(title_text) - self.dialog.set_geometry_hints(min_width=400, min_height=96) - self.dialog.set_position(gtk.WIN_POS_CENTER_ON_PARENT)

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