more py2.6 fixes

gnupg/_logger.py

@@ -78,13 +78,13 @@ def create_logger(level=logging.NOTSET):
     if level > logging.NOTSET:
         logging.basicConfig(level=level, filename=_fn,
                             filemode="a", format=_fmt)
-        logging.captureWarnings(True)
         logging.logThreads = True
-
+        if hasattr(logging,'captureWarnings'):
+            logging.captureWarnings(True)
         colouriser = _ansistrm.ColorizingStreamHandler
         colouriser.level_map[9]  = (None, 'blue', False)
         colouriser.level_map[10] = (None, 'cyan', False)
-        handler = colouriser(stream=sys.stderr)
+        handler = colouriser(sys.stderr)
         handler.setLevel(level)
 
         formatr = logging.Formatter(_fmt)

gnupg/_meta.py

@@ -640,8 +640,8 @@ class GPGBase(object):
         if not keyserver:
             keyserver = self.keyserver
 
-        args = ['--keyserver {}'.format(keyserver),
-                '--recv-keys {}'.format(keyids)]
+        args = ['--keyserver {0}'.format(keyserver),
+                '--recv-keys {0}'.format(keyids)]
         log.info('Requesting keys from %s: %s' % (keyserver, keyids))
 
         result = self._result_map['import'](self)

gnupg/gnupg.py

@@ -416,7 +416,7 @@ class GPG(GPGBase):
             fingerprints = ' '.join(fingerprints)
 
         args = ['--batch']
-        args.append("--delete-{} {}".format(which, fingerprints))
+        args.append("--delete-{0} {1}".format(which, fingerprints))
 
         result = self._result_map['delete'](self)
         p = self._open_subprocess(args)
@@ -441,7 +441,7 @@ class GPG(GPGBase):
             keyids = ' '.join(['%s' % k for k in keyids])
 
         args = ["--armor"]
-        args.append("--export{} {}".format(which, keyids))
+        args.append("--export{0} {1}".format(which, keyids))
 
         p = self._open_subprocess(args)
         ## gpg --export produces no status-fd output; stdout will be empty in

gnupg/test/test_gnupg.py

@@ -820,14 +820,14 @@ authentication."""
         riggio_input = self.gpg.gen_key_input(separate_keyring=True, **riggio)
         log.info("Key stored in separate keyring: %s" % self.gpg.temp_keyring)
         riggio = self.gpg.gen_key(riggio_input)
-        self.gpg.options = ['--keyring {}'.format(riggio.keyring)]
+        self.gpg.options = ['--keyring {0}'.format(riggio.keyring)]
         riggio_key = self.gpg.export_keys(riggio.fingerprint)
         self.gpg.import_keys(riggio_key)
 
         sicari_input = self.gpg.gen_key_input(separate_keyring=True, **sicari)
         log.info("Key stored in separate keyring: %s" % self.gpg.temp_keyring)
         sicari = self.gpg.gen_key(sicari_input)
-        self.gpg.options.append('--keyring {}'.format(sicari.keyring))
+        self.gpg.options.append('--keyring {0}'.format(sicari.keyring))
         sicari_key = self.gpg.export_keys(sicari.fingerprint)
         self.gpg.import_keys(sicari_key)