diff options
| author | Lance Stout <lancestout@gmail.com> | 2012-07-20 00:25:32 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2012-07-20 00:25:32 -0700 |
| commit | 060c9ab6794cbe6c62c312b1f42bd3767ff66b80 (patch) | |
| tree | 4802e7d13643dc4546e44bdd2e135dd9ad73b34c /sleekxmpp/plugins | |
| parent | 78f03253983779673beaf3c102ae315707a49d2c (diff) | |
| parent | acd9c32a9f8ba5476ac238a7536c838789ed4ab5 (diff) | |
| download | slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.gz slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.bz2 slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.tar.xz slixmpp-060c9ab6794cbe6c62c312b1f42bd3767ff66b80.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'sleekxmpp/plugins')
| -rw-r--r-- | sleekxmpp/plugins/__init__.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0191/blocking.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 1613ac4d..04db0d6e 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -47,7 +47,7 @@ __all__ = [ 'xep_0172', # User Nickname 'xep_0184', # Message Receipts 'xep_0186', # Invisible Command - 'xep_0191', # Simple Communications Blocking + 'xep_0191', # Blocking Command 'xep_0198', # Stream Management 'xep_0199', # Ping 'xep_0202', # Entity Time diff --git a/sleekxmpp/plugins/xep_0191/blocking.py b/sleekxmpp/plugins/xep_0191/blocking.py index 0d903acc..4a87479a 100644 --- a/sleekxmpp/plugins/xep_0191/blocking.py +++ b/sleekxmpp/plugins/xep_0191/blocking.py @@ -22,7 +22,7 @@ log = logging.getLogger(__name__) class XEP_0191(BasePlugin): name = 'xep_0191' - description = 'XEP-0191: Simple Communications Blocking' + description = 'XEP-0191: Blocking Command' dependencies = set(['xep_0030']) stanza = stanza |