summaryrefslogtreecommitdiff
path: root/poezio/core
diff options
context:
space:
mode:
Diffstat (limited to 'poezio/core')
-rw-r--r--poezio/core/commands.py4
-rw-r--r--poezio/core/completions.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/poezio/core/commands.py b/poezio/core/commands.py
index c256ccab..b08a082f 100644
--- a/poezio/core/commands.py
+++ b/poezio/core/commands.py
@@ -9,6 +9,8 @@ log = logging.getLogger(__name__)
import os
from xml.etree import cElementTree as ET
+from slixmpp.exceptions import XMPPError
+from slixmpp.xmlstream.xmlstream import NotConnectedError
from slixmpp.xmlstream.stanzabase import StanzaBase
from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath
@@ -157,7 +159,7 @@ class CommandCore:
pres = self.core.xmpp.make_presence(pto=jid, ptype=ptype, pstatus=status)
self.core.events.trigger('send_normal_presence', pres)
pres.send()
- except:
+ except (XMPPError, NotConnectedError):
self.core.information('Could not send directed presence', 'Error')
log.debug('Could not send directed presence to %s', jid, exc_info=True)
return
diff --git a/poezio/core/completions.py b/poezio/core/completions.py
index a6007152..634ab6b3 100644
--- a/poezio/core/completions.py
+++ b/poezio/core/completions.py
@@ -55,7 +55,7 @@ class CompletionCore:
themes_dir = os.path.expanduser(themes_dir)
try:
names = os.listdir(themes_dir)
- except OSError as e:
+ except OSError:
log.error('Completion for /theme failed', exc_info=True)
return False
theme_files = [name[:-3] for name in names if name.endswith('.py') and name != '__init__.py']