Merge pull request #262 from mmb/otr-v1.9.2

otr.py 1.9.2: Fix WeeChat crash on /reload

python/otr.py

@@ -121,7 +121,8 @@ class PythonVersion3(object):
         """Convert a Unicode to a utf-8 encoded string."""
         return strng
-if sys.version_info.major >= 3:
+# We cannot use version_info.major as this is only supported on python >= 2.7
+if sys.version_info[0] >= 3:
     PYVER = PythonVersion3(sys.version_info.minor)
 else:
     PYVER = PythonVersion2()
@@ -163,7 +164,7 @@ This script supports only OTR protocol version 2.
 SCRIPT_AUTHOR = 'Matthew M. Boedicker'
 SCRIPT_LICENCE = 'GPL3'
-SCRIPT_VERSION = '1.9.1'
+SCRIPT_VERSION = '1.9.2'
 OTR_DIR_NAME = 'otr'
@@ -268,7 +269,7 @@ def print_buffer(buf, message, level='info'):
     using color according to level."""
     prnt(buf, '{prefix}\t{msg}'.format(
         prefix=get_prefix(),
-        msg=colorize(message, 'buffer.{}'.format(level))))
+        msg=colorize(message, 'buffer.{0}'.format(level))))
 def get_prefix():
     """Returns configured message prefix."""
@@ -394,7 +395,7 @@ def config_prefix(option):
 def config_color(option):
     """Get the color of a color config option."""
     return weechat.color(weechat.config_color(config_get_prefixed(
-        'color.{}'.format(option))))
+        'color.{0}'.format(option))))
 def config_string(option):
     """Get the string value of a config option with utf-8 decode."""
@@ -468,7 +469,7 @@ def format_default_policies():
         buf.write('  {policy} ({desc}) : {value}\n'.format(
             policy=policy,
             desc=desc,
-            value=config_string('policy.default.{}'.format(policy))))
+            value=config_string('policy.default.{0}'.format(policy))))
     buf.write('Change default policies with: /otr policy default NAME on|off')
@@ -533,7 +534,7 @@ def show_peer_fingerprints(grep=None):
 def private_key_file_path(account_name):
     """Return the private key file path for an account."""
-    return os.path.join(OTR_DIR, '{}.key3'.format(account_name))
+    return os.path.join(OTR_DIR, '{0}.key3'.format(account_name))
 def read_private_key(key_file_path):
     """Return the private key in a private key file."""
@@ -631,7 +632,7 @@ class IrcContext(potr.context.Context):
             if option == '':
                 option = config_get_prefixed(
-                    'policy.default.{}'.format(key_lower))
+                    'policy.default.{0}'.format(key_lower))
             result = bool(weechat.config_boolean(option))
@@ -646,7 +647,7 @@ class IrcContext(potr.context.Context):
         else:
             msg = PYVER.to_unicode(msg)
-        debug(('inject', msg, 'len {}'.format(len(msg)), appdata))
+        debug(('inject', msg, 'len {0}'.format(len(msg)), appdata))
         privmsg(self.peer_server, self.peer_nick, msg)
@@ -684,7 +685,7 @@ class IrcContext(potr.context.Context):
             if trust is None:
                 fpr = str(self.getCurrentKey())
-                self.print_buffer('New fingerprint: {}'.format(fpr), 'warning')
+                self.print_buffer('New fingerprint: {0}'.format(fpr), 'warning')
                 self.setCurrentTrust('')
             if bool(trust):
@@ -711,7 +712,7 @@ class IrcContext(potr.context.Context):
         """Return the max message size for this context."""
         # remove 'PRIVMSG <nick> :' from max message size
         result = self.user.maxMessageSize - 10 - len(self.peer_nick)
-        debug('max message size {}'.format(result))
+        debug('max message size {0}'.format(result))
         return result
@@ -941,16 +942,16 @@ Note: You can safely omit specifying the peer and server when
         if (previous_log_level >= 0) and (previous_log_level < 10):
             self.print_buffer(
-                'Restoring buffer logging value to: {}'.format(
+                'Restoring buffer logging value to: {0}'.format(
                     previous_log_level), 'warning')
-            weechat.command(buf, '/mute logger set {}'.format(
+            weechat.command(buf, '/mute logger set {0}'.format(
                 previous_log_level))
         if previous_log_level == -1:
             logger_option_name = self.get_logger_option_name()
             self.print_buffer(
                 'Restoring buffer logging value to default', 'warning')
-            weechat.command(buf, '/mute unset {}'.format(
+            weechat.command(buf, '/mute unset {0}'.format(
                 logger_option_name))
         del self.previous_log_level
@@ -1000,7 +1001,7 @@ Note: You can safely omit specifying the peer and server when
     def __repr__(self):
         return PYVER.to_str((
-            '<{} {:x} peer_nick={c.peer_nick} peer_server={c.peer_server}>'
+            '<{0} {1:x} peer_nick={c.peer_nick} peer_server={c.peer_server}>'
             ).format(self.__class__.__name__, id(self), c=self))
 class IrcOtrAccount(potr.context.Account):
@@ -1022,7 +1023,7 @@ class IrcOtrAccount(potr.context.Account):
         self.defaultQuery = self.defaultQuery.replace("\n", ' ')
         self.key_file_path = private_key_file_path(name)
-        self.fpr_file_path = os.path.join(OTR_DIR, '{}.fpr'.format(name))
+        self.fpr_file_path = os.path.join(OTR_DIR, '{0}.fpr'.format(name))
         self.load_trusts()
@@ -1124,7 +1125,7 @@ class IrcHTMLParser(PYVER.html_parser.HTMLParser):
                 if self.result[self.linkstart:] == self.linktarget:
                     self.result += ']'
                 else:
-                    self.result += ']({})'.format(self.linktarget)
+                    self.result += ']({0})'.format(self.linktarget)
                 self.linktarget = ''
     def handle_data(self, data):
@@ -1137,7 +1138,7 @@ class IrcHTMLParser(PYVER.html_parser.HTMLParser):
             self.result += PYVER.unichr(
                 PYVER.html_entities.name2codepoint[name])
         except KeyError:
-            self.result += '&{};'.format(name)
+            self.result += '&{0};'.format(name)
     def handle_charref(self, name):
         """Called for character references, such as &#39;"""
@@ -1147,7 +1148,7 @@ class IrcHTMLParser(PYVER.html_parser.HTMLParser):
             else:
                 self.result += PYVER.unichr(int(name))
         except ValueError:
-            self.result += '&#{};'.format(name)
+            self.result += '&#{0};'.format(name)
 class TableFormatter(object):
     """Format lists of string into aligned tables."""
@@ -1209,7 +1210,7 @@ def message_in_cb(data, modifier, modifier_data, string):
             context.handle_tlvs(tlvs)
         except potr.context.ErrorReceived as err:
-            context.print_buffer('Received OTR error: {}'.format(
+            context.print_buffer('Received OTR error: {0}'.format(
                 PYVER.to_unicode(err.args[0])), 'error')
         except potr.context.NotEncryptedError:
             context.print_buffer(
@@ -1385,9 +1386,9 @@ def command_cb(data, buf, args):
             if context.is_encrypted():
                 context.print_buffer(
                     'This conversation is encrypted.', 'success')
-                context.print_buffer("Your fingerprint is: {}".format(
+                context.print_buffer("Your fingerprint is: {0}".format(
                     context.user.getPrivkey()))
-                context.print_buffer("Your peer's fingerprint is: {}".format(
+                context.print_buffer("Your peer's fingerprint is: {0}".format(
                     potr.human_hash(context.crypto.theirPubkey.cfingerprint())))
                 if context.is_verified():
                     context.print_buffer(
@@ -1463,7 +1464,7 @@ def command_cb(data, buf, args):
                 context.smpInit(secret, question)
             except potr.context.NotEncryptedError:
                 context.print_buffer(
-                    'There is currently no encrypted session with {}.'.format(
+                    'There is currently no encrypted session with {0}.'.format(
                         context.peer), 'error')
             else:
                 if question:
@@ -1490,7 +1491,7 @@ def command_cb(data, buf, args):
                     context.smpAbort()
                 except potr.context.NotEncryptedError:
                     context.print_buffer(
-                        'There is currently no encrypted session with {}.'
+                        'There is currently no encrypted session with {0}.'
                         .format(context.peer), 'error')
                 else:
                     debug('SMP aborted')
@@ -1826,7 +1827,7 @@ def buffer_closing_cb(data, signal, signal_data):
 def init_config():
     """Set up configuration options and load config file."""
     global CONFIG_FILE
-    CONFIG_FILE = weechat.config_new(SCRIPT_NAME, 'config_reload_cb', '')
+    CONFIG_FILE = weechat.config_new(SCRIPT_NAME, '', '')
     global CONFIG_SECTIONS
     CONFIG_SECTIONS = {}
@@ -1993,13 +1994,6 @@ def init_config():
     weechat.config_read(CONFIG_FILE)
-def config_reload_cb(data, config_file):
-    """/reload callback to reload config from file."""
-    free_all_config()
-    init_config()
-
-    return weechat.WEECHAT_CONFIG_READ_OK
-
 def free_all_config():
     """Free all config options, sections and config file."""
     for section in CONFIG_SECTIONS.values():
@@ -2022,13 +2016,19 @@ def git_info():
     if os.path.isdir(git_dir):
         import subprocess
         try:
-            result = PYVER.to_unicode(subprocess.check_output([
+            # We can't use check_output here without breaking compatibility
+            # for Python 2.6, but we ignore the return value anyway, so Popen
+            # is only slightly more complicated:
+            process = subprocess.Popen([
                 'git',
                 '--git-dir', git_dir,
                 '--work-tree', script_dir,
                 'describe', '--dirty', '--always',
-                ])).lstrip('v').rstrip()
-        except (OSError, subprocess.CalledProcessError):
+                ], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            output = process.communicate()[0]
+            if output:
+                result = PYVER.to_unicode(output).lstrip('v').rstrip()
+        except OSError:
             pass
     return result