Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits:
12 changed files:
- nbxmpp/modules/annotations.py
- nbxmpp/modules/blocking.py
- nbxmpp/modules/discovery.py
- nbxmpp/modules/omemo.py
- nbxmpp/modules/openpgp.py
- nbxmpp/modules/ping.py
- nbxmpp/modules/pubsub.py
- nbxmpp/modules/roster.py
- nbxmpp/modules/software_version.py
- nbxmpp/modules/user_avatar.py
- nbxmpp/modules/util.py
- nbxmpp/task.py
Changes:
| ... | ... | @@ -82,8 +82,6 @@ class Annotations(BaseModule): |
| 82 | 82 |
def set_annotations(self, notes):
|
| 83 | 83 |
_task = yield
|
| 84 | 84 |
|
| 85 |
- self._log.info('Set annotations for %s:', self.domain)
|
|
| 86 |
- |
|
| 87 | 85 |
for note in notes:
|
| 88 | 86 |
self._log.info(note)
|
| 89 | 87 |
|
| ... | ... | @@ -69,8 +69,6 @@ class Blocking(BaseModule): |
| 69 | 69 |
def block(self, jids, report=None):
|
| 70 | 70 |
_task = yield
|
| 71 | 71 |
|
| 72 |
- self._log.info('Block: %s', jids)
|
|
| 73 |
- |
|
| 74 | 72 |
response = yield _make_block_request(jids, report)
|
| 75 | 73 |
yield process_response(response)
|
| 76 | 74 |
|
| ... | ... | @@ -78,8 +76,6 @@ class Blocking(BaseModule): |
| 78 | 76 |
def unblock(self, jids):
|
| 79 | 77 |
_task = yield
|
| 80 | 78 |
|
| 81 |
- self._log.info('Unblock: %s', jids)
|
|
| 82 |
- |
|
| 83 | 79 |
response = yield _make_unblock_request(jids)
|
| 84 | 80 |
yield process_response(response)
|
| 85 | 81 |
|
| ... | ... | @@ -62,8 +62,6 @@ class Discovery(BaseModule): |
| 62 | 62 |
def disco_info(self, jid, node=None):
|
| 63 | 63 |
_task = yield
|
| 64 | 64 |
|
| 65 |
- self._log.info('Disco info: %s, node: %s', jid, node)
|
|
| 66 |
- |
|
| 67 | 65 |
response = yield get_disco_request(Namespace.DISCO_INFO, jid, node)
|
| 68 | 66 |
if response.isError():
|
| 69 | 67 |
raise StanzaError(response)
|
| ... | ... | @@ -73,8 +71,6 @@ class Discovery(BaseModule): |
| 73 | 71 |
def disco_items(self, jid, node=None):
|
| 74 | 72 |
_task = yield
|
| 75 | 73 |
|
| 76 |
- self._log.info('Disco items: %s, node: %s', jid, node)
|
|
| 77 |
- |
|
| 78 | 74 |
response = yield get_disco_request(Namespace.DISCO_ITEMS, jid, node)
|
| 79 | 75 |
if response.isError():
|
| 80 | 76 |
raise StanzaError(response)
|
| ... | ... | @@ -97,8 +97,6 @@ class OMEMO(BaseModule): |
| 97 | 97 |
def set_devicelist(self, devicelist=None, public=True):
|
| 98 | 98 |
task = yield
|
| 99 | 99 |
|
| 100 |
- self._log.info('Set devicelist: %s', devicelist)
|
|
| 101 |
- |
|
| 102 | 100 |
access_model = 'open' if public else 'presence'
|
| 103 | 101 |
|
| 104 | 102 |
options = {
|
| ... | ... | @@ -133,8 +131,6 @@ class OMEMO(BaseModule): |
| 133 | 131 |
def set_bundle(self, bundle, device_id, public=True):
|
| 134 | 132 |
task = yield
|
| 135 | 133 |
|
| 136 |
- self._log.info('Set bundle')
|
|
| 137 |
- |
|
| 138 | 134 |
access_model = 'open' if public else 'presence'
|
| 139 | 135 |
|
| 140 | 136 |
options = {
|
| ... | ... | @@ -155,8 +151,6 @@ class OMEMO(BaseModule): |
| 155 | 151 |
def request_bundle(self, jid, device_id):
|
| 156 | 152 |
task = yield
|
| 157 | 153 |
|
| 158 |
- self._log.info('Request bundle from: %s %s', jid, device_id)
|
|
| 159 |
- |
|
| 160 | 154 |
items = yield self.request_items(
|
| 161 | 155 |
f'{Namespace.OMEMO_TEMP_BUNDLE}:{device_id}',
|
| 162 | 156 |
max_items=1,
|
| ... | ... | @@ -135,8 +135,6 @@ class OpenPGP(BaseModule): |
| 135 | 135 |
'pubsub#access_model': access_model,
|
| 136 | 136 |
}
|
| 137 | 137 |
|
| 138 |
- self._log.info('Set keylist: %s', keylist)
|
|
| 139 |
- |
|
| 140 | 138 |
result = yield self.publish(Namespace.OPENPGP_PK,
|
| 141 | 139 |
_make_keylist(keylist),
|
| 142 | 140 |
id_='current',
|
| ... | ... | @@ -149,8 +147,6 @@ class OpenPGP(BaseModule): |
| 149 | 147 |
def set_public_key(self, key, fingerprint, date, public=True):
|
| 150 | 148 |
task = yield
|
| 151 | 149 |
|
| 152 |
- self._log.info('Set public key')
|
|
| 153 |
- |
|
| 154 | 150 |
access_model = 'open' if public else 'presence'
|
| 155 | 151 |
|
| 156 | 152 |
options = {
|
| ... | ... | @@ -170,8 +166,6 @@ class OpenPGP(BaseModule): |
| 170 | 166 |
def request_public_key(self, jid, fingerprint):
|
| 171 | 167 |
task = yield
|
| 172 | 168 |
|
| 173 |
- self._log.info('Request public key from: %s %s', jid, fingerprint)
|
|
| 174 |
- |
|
| 175 | 169 |
items = yield self.request_items(
|
| 176 | 170 |
f'{Namespace.OPENPGP_PK}:{fingerprint}',
|
| 177 | 171 |
max_items=1,
|
| ... | ... | @@ -193,8 +187,6 @@ class OpenPGP(BaseModule): |
| 193 | 187 |
def request_keylist(self, jid=None):
|
| 194 | 188 |
task = yield
|
| 195 | 189 |
|
| 196 |
- self._log.info('Request keylist from: %s', jid)
|
|
| 197 |
- |
|
| 198 | 190 |
items = yield self.request_items(
|
| 199 | 191 |
Namespace.OPENPGP_PK,
|
| 200 | 192 |
max_items=1,
|
| ... | ... | @@ -217,8 +209,6 @@ class OpenPGP(BaseModule): |
| 217 | 209 |
def request_secret_key(self):
|
| 218 | 210 |
task = yield
|
| 219 | 211 |
|
| 220 |
- self._log.info('Request secret key')
|
|
| 221 |
- |
|
| 222 | 212 |
items = yield self.request_items(
|
| 223 | 213 |
Namespace.OPENPGP_SK,
|
| 224 | 214 |
max_items=1)
|
| ... | ... | @@ -239,8 +229,6 @@ class OpenPGP(BaseModule): |
| 239 | 229 |
def set_secret_key(self, secret_key):
|
| 240 | 230 |
task = yield
|
| 241 | 231 |
|
| 242 |
- self._log.info('Set public key')
|
|
| 243 |
- |
|
| 244 | 232 |
options = {
|
| 245 | 233 |
'pubsub#persist_items': 'true',
|
| 246 | 234 |
'pubsub#access_model': 'whitelist',
|
| ... | ... | @@ -47,7 +47,6 @@ class Ping(BaseModule): |
| 47 | 47 |
def ping(self, jid):
|
| 48 | 48 |
_task = yield
|
| 49 | 49 |
|
| 50 |
- self._log.info('Ping')
|
|
| 51 | 50 |
response = yield _make_ping_request(jid)
|
| 52 | 51 |
yield process_response(response)
|
| 53 | 52 |
|
| ... | ... | @@ -148,8 +148,6 @@ class PubSub(BaseModule): |
| 148 | 148 |
def get_access_model(self, node):
|
| 149 | 149 |
_task = yield
|
| 150 | 150 |
|
| 151 |
- self._log.info('Request access model')
|
|
| 152 |
- |
|
| 153 | 151 |
result = yield self.get_node_configuration(node)
|
| 154 | 152 |
|
| 155 | 153 |
raise_if_error(result)
|
| ... | ... | @@ -179,8 +177,6 @@ class PubSub(BaseModule): |
| 179 | 177 |
|
| 180 | 178 |
result.form['pubsub#access_model'].value = model
|
| 181 | 179 |
|
| 182 |
- self._log.info('Set access model %s', model)
|
|
| 183 |
- |
|
| 184 | 180 |
result = yield self.set_node_configuration(node, result.form)
|
| 185 | 181 |
|
| 186 | 182 |
yield finalize(task, result)
|
| ... | ... | @@ -55,8 +55,7 @@ class Roster(BaseModule): |
| 55 | 55 |
if ver_support and version is None:
|
| 56 | 56 |
version = ''
|
| 57 | 57 |
|
| 58 |
- self._log.info('Request Roster, version: %s, ver support: %s',
|
|
| 59 |
- version, ver_support)
|
|
| 58 |
+ self._log.info('Roster versioning supported: %s', ver_support)
|
|
| 60 | 59 |
|
| 61 | 60 |
response = yield _make_request(version, ver_support)
|
| 62 | 61 |
if response.isError():
|
| ... | ... | @@ -59,8 +59,6 @@ class SoftwareVersion(BaseModule): |
| 59 | 59 |
def request_software_version(self, jid):
|
| 60 | 60 |
_task = yield
|
| 61 | 61 |
|
| 62 |
- self._log.info('Request software version for %s', jid)
|
|
| 63 |
- |
|
| 64 | 62 |
response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION)
|
| 65 | 63 |
if response.isError():
|
| 66 | 64 |
raise StanzaError(response)
|
| ... | ... | @@ -159,7 +159,6 @@ class UserAvatar(BaseModule): |
| 159 | 159 |
|
| 160 | 160 |
for info, data in avatar.pubsub_avatar_info():
|
| 161 | 161 |
item = _make_avatar_data_node(data)
|
| 162 |
- self._log.info('Publish avatar data: %s, %s', info, access_model)
|
|
| 163 | 162 |
|
| 164 | 163 |
result = yield self.publish(Namespace.AVATAR_DATA,
|
| 165 | 164 |
item,
|
| ... | ... | @@ -178,8 +177,6 @@ class UserAvatar(BaseModule): |
| 178 | 177 |
def _publish_avatar_metadata(self, metadata, access_model):
|
| 179 | 178 |
task = yield
|
| 180 | 179 |
|
| 181 |
- self._log.info('Publish avatar meta data: %s', metadata)
|
|
| 182 |
- |
|
| 183 | 180 |
options = {
|
| 184 | 181 |
'pubsub#persist_items': 'true',
|
| 185 | 182 |
'pubsub#access_model': access_model,
|
| ... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 |
# You should have received a copy of the GNU General Public License
|
| 16 | 16 |
# along with this program; If not, see <http://www.gnu.org/licenses/>.
|
| 17 | 17 |
|
| 18 |
+import inspect
|
|
| 18 | 19 |
from urllib.parse import urlparse
|
| 19 | 20 |
from urllib.parse import unquote
|
| 20 | 21 |
|
| ... | ... | @@ -61,3 +62,16 @@ def parse_xmpp_uri(uri): |
| 61 | 62 |
dict_[key] = unquote(value)
|
| 62 | 63 |
|
| 63 | 64 |
return (url.path, action, dict_)
|
| 65 |
+ |
|
| 66 |
+ |
|
| 67 |
+def make_func_arguments_string(func, self, args, kwargs):
|
|
| 68 |
+ signature = inspect.signature(func)
|
|
| 69 |
+ bound_arguments = signature.bind(self, *args, **kwargs)
|
|
| 70 |
+ bound_arguments.apply_defaults()
|
|
| 71 |
+ arg_string = ''
|
|
| 72 |
+ for name, arg in bound_arguments.arguments.items():
|
|
| 73 |
+ if name == 'self':
|
|
| 74 |
+ continue
|
|
| 75 |
+ arg_string += f'{name}={arg}, '
|
|
| 76 |
+ arg_string = arg_string[:-2]
|
|
| 77 |
+ return f'{func.__name__}({arg_string})'
|
| ... | ... | @@ -27,6 +27,7 @@ from nbxmpp.errors import is_error |
| 27 | 27 |
from nbxmpp.errors import CancelledError
|
| 28 | 28 |
from nbxmpp.errors import TimeoutStanzaError
|
| 29 | 29 |
from nbxmpp.simplexml import Node
|
| 30 |
+from nbxmpp.modules.util import make_func_arguments_string
|
|
| 30 | 31 |
|
| 31 | 32 |
|
| 32 | 33 |
log = logging.getLogger('nbxmpp.task')
|
| ... | ... | @@ -78,6 +79,8 @@ def _setup_task(task, client, callback, user_data): |
| 78 | 79 |
def iq_request_task(func):
|
| 79 | 80 |
@wraps(func)
|
| 80 | 81 |
def func_wrapper(self, *args, timeout=None, callback=None, user_data=None, **kwargs):
|
| 82 |
+ if self._log.isEnabledFor(logging.INFO):
|
|
| 83 |
+ self._log.info(make_func_arguments_string(func, self, args, kwargs))
|
|
| 81 | 84 |
task = IqRequestTask(func(self, *args, **kwargs),
|
| 82 | 85 |
self._log,
|
| 83 | 86 |
self._client)
|