summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xexamples/IoT_TestDevice.py17
-rwxr-xr-xexamples/adhoc_provider.py12
-rwxr-xr-xexamples/adhoc_user.py12
-rwxr-xr-xexamples/admin_commands.py12
-rwxr-xr-xexamples/confirm_answer.py12
-rwxr-xr-xexamples/confirm_ask.py12
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_provider.py12
-rwxr-xr-xexamples/custom_stanzas/custom_stanza_user.py12
-rwxr-xr-xexamples/disco_browser.py12
-rwxr-xr-xexamples/download_avatars.py12
-rwxr-xr-xexamples/echo_client.py12
-rwxr-xr-xexamples/echo_component.py12
-rwxr-xr-xexamples/gtalk_custom_domain.py12
-rw-r--r--examples/http_over_xmpp.py17
-rwxr-xr-xexamples/http_upload.py12
-rwxr-xr-xexamples/ibb_transfer/ibb_receiver.py12
-rwxr-xr-xexamples/ibb_transfer/ibb_sender.py12
-rwxr-xr-xexamples/mam.py12
-rwxr-xr-xexamples/markup.py12
-rwxr-xr-xexamples/mix.py12
-rwxr-xr-xexamples/muc.py12
-rwxr-xr-xexamples/ping.py12
-rwxr-xr-xexamples/pubsub_client.py1
-rwxr-xr-xexamples/pubsub_events.py1
-rwxr-xr-xexamples/register_account.py12
-rwxr-xr-xexamples/roster_browser.py12
-rwxr-xr-xexamples/rpc_async.py13
-rwxr-xr-xexamples/rpc_client_side.py13
-rwxr-xr-xexamples/rpc_server_side.py13
-rwxr-xr-xexamples/s5b_transfer/s5b_receiver.py12
-rwxr-xr-xexamples/s5b_transfer/s5b_sender.py12
-rwxr-xr-xexamples/send_client.py12
-rwxr-xr-xexamples/set_avatar.py12
-rwxr-xr-xexamples/thirdparty_auth.py12
-rw-r--r--slixmpp/__init__.py11
-rw-r--r--slixmpp/basexmpp.py20
-rw-r--r--slixmpp/clientxmpp.py20
-rw-r--r--slixmpp/componentxmpp.py20
-rw-r--r--slixmpp/exceptions.py15
-rw-r--r--slixmpp/features/__init__.py11
-rw-r--r--slixmpp/features/feature_bind/__init__.py11
-rw-r--r--slixmpp/features/feature_bind/bind.py11
-rw-r--r--slixmpp/features/feature_bind/stanza.py11
-rw-r--r--slixmpp/features/feature_mechanisms/__init__.py11
-rw-r--r--slixmpp/features/feature_mechanisms/mechanisms.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/__init__.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/abort.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/auth.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/challenge.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/failure.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/mechanisms.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/response.py11
-rw-r--r--slixmpp/features/feature_mechanisms/stanza/success.py11
-rw-r--r--slixmpp/features/feature_preapproval/__init__.py11
-rw-r--r--slixmpp/features/feature_preapproval/preapproval.py11
-rw-r--r--slixmpp/features/feature_preapproval/stanza.py11
-rw-r--r--slixmpp/features/feature_rosterver/__init__.py11
-rw-r--r--slixmpp/features/feature_rosterver/rosterver.py11
-rw-r--r--slixmpp/features/feature_rosterver/stanza.py11
-rw-r--r--slixmpp/features/feature_session/__init__.py11
-rw-r--r--slixmpp/features/feature_session/session.py11
-rw-r--r--slixmpp/features/feature_session/stanza.py11
-rw-r--r--slixmpp/features/feature_starttls/__init__.py11
-rw-r--r--slixmpp/features/feature_starttls/stanza.py11
-rw-r--r--slixmpp/features/feature_starttls/starttls.py11
-rw-r--r--slixmpp/jid.py18
-rw-r--r--slixmpp/plugins/__init__.py11
-rw-r--r--slixmpp/plugins/base.py20
-rw-r--r--slixmpp/plugins/gmail_notify.py11
-rw-r--r--slixmpp/plugins/google/__init__.py11
-rw-r--r--slixmpp/plugins/google/auth/__init__.py11
-rw-r--r--slixmpp/plugins/google/auth/auth.py11
-rw-r--r--slixmpp/plugins/google/auth/stanza.py11
-rw-r--r--slixmpp/plugins/google/gmail/__init__.py11
-rw-r--r--slixmpp/plugins/google/gmail/notifications.py11
-rw-r--r--slixmpp/plugins/google/gmail/stanza.py11
-rw-r--r--slixmpp/plugins/google/nosave/__init__.py11
-rw-r--r--slixmpp/plugins/google/nosave/nosave.py11
-rw-r--r--slixmpp/plugins/google/nosave/stanza.py11
-rw-r--r--slixmpp/plugins/google/settings/__init__.py11
-rw-r--r--slixmpp/plugins/google/settings/settings.py11
-rw-r--r--slixmpp/plugins/google/settings/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0004/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0004/dataforms.py11
-rw-r--r--slixmpp/plugins/xep_0004/stanza/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0004/stanza/field.py11
-rw-r--r--slixmpp/plugins/xep_0004/stanza/form.py11
-rw-r--r--slixmpp/plugins/xep_0009/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0009/binding.py11
-rw-r--r--slixmpp/plugins/xep_0009/remote.py11
-rw-r--r--slixmpp/plugins/xep_0009/rpc.py11
-rw-r--r--slixmpp/plugins/xep_0009/stanza/RPC.py11
-rw-r--r--slixmpp/plugins/xep_0009/stanza/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0012/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0012/last_activity.py11
-rw-r--r--slixmpp/plugins/xep_0012/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0013/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0013/offline.py11
-rw-r--r--slixmpp/plugins/xep_0013/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0016/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0016/privacy.py11
-rw-r--r--slixmpp/plugins/xep_0020/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0020/feature_negotiation.py11
-rw-r--r--slixmpp/plugins/xep_0020/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0027/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0027/gpg.py11
-rw-r--r--slixmpp/plugins/xep_0027/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0030/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0030/disco.py11
-rw-r--r--slixmpp/plugins/xep_0030/stanza/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0030/stanza/info.py11
-rw-r--r--slixmpp/plugins/xep_0030/stanza/items.py11
-rw-r--r--slixmpp/plugins/xep_0030/static.py11
-rw-r--r--slixmpp/plugins/xep_0033/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0033/addresses.py11
-rw-r--r--slixmpp/plugins/xep_0033/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0045/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0045/muc.py13
-rw-r--r--slixmpp/plugins/xep_0045/stanza.py13
-rw-r--r--slixmpp/plugins/xep_0047/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0048/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0048/bookmarks.py11
-rw-r--r--slixmpp/plugins/xep_0048/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0049/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0049/private_storage.py11
-rw-r--r--slixmpp/plugins/xep_0049/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0050/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0050/adhoc.py11
-rw-r--r--slixmpp/plugins/xep_0050/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0054/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0054/vcard_temp.py11
-rw-r--r--slixmpp/plugins/xep_0059/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0059/rsm.py11
-rw-r--r--slixmpp/plugins/xep_0059/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0060/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0060/pubsub.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/base.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_errors.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_event.py11
-rw-r--r--slixmpp/plugins/xep_0060/stanza/pubsub_owner.py11
-rw-r--r--slixmpp/plugins/xep_0066/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0066/oob.py11
-rw-r--r--slixmpp/plugins/xep_0066/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0070/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0070/confirm.py11
-rw-r--r--slixmpp/plugins/xep_0070/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0071/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0071/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0071/xhtml_im.py11
-rw-r--r--slixmpp/plugins/xep_0077/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0077/register.py11
-rw-r--r--slixmpp/plugins/xep_0077/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0078/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0078/legacyauth.py11
-rw-r--r--slixmpp/plugins/xep_0078/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0079/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0079/amp.py11
-rw-r--r--slixmpp/plugins/xep_0079/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0080/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0080/geoloc.py11
-rw-r--r--slixmpp/plugins/xep_0080/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0082.py11
-rw-r--r--slixmpp/plugins/xep_0084/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0084/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0085/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0085/chat_states.py11
-rw-r--r--slixmpp/plugins/xep_0085/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0086/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0086/legacy_error.py11
-rw-r--r--slixmpp/plugins/xep_0086/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0091/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0091/legacy_delay.py11
-rw-r--r--slixmpp/plugins/xep_0091/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0092/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0092/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0092/version.py11
-rw-r--r--slixmpp/plugins/xep_0095/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0095/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0095/stream_initiation.py11
-rw-r--r--slixmpp/plugins/xep_0096/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0096/file_transfer.py11
-rw-r--r--slixmpp/plugins/xep_0096/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0106.py11
-rw-r--r--slixmpp/plugins/xep_0107/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0108/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0115/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0115/caps.py11
-rw-r--r--slixmpp/plugins/xep_0115/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0115/static.py11
-rw-r--r--slixmpp/plugins/xep_0118/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0128/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0128/extended_disco.py11
-rw-r--r--slixmpp/plugins/xep_0128/static.py11
-rw-r--r--slixmpp/plugins/xep_0131/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0131/headers.py11
-rw-r--r--slixmpp/plugins/xep_0131/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0133.py11
-rw-r--r--slixmpp/plugins/xep_0138.py11
-rw-r--r--slixmpp/plugins/xep_0152/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0152/reachability.py11
-rw-r--r--slixmpp/plugins/xep_0152/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0153/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0153/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0153/vcard_avatar.py11
-rw-r--r--slixmpp/plugins/xep_0163.py11
-rw-r--r--slixmpp/plugins/xep_0172/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0184/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0184/receipt.py11
-rw-r--r--slixmpp/plugins/xep_0184/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0186/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0186/invisible_command.py11
-rw-r--r--slixmpp/plugins/xep_0186/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0191/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0191/blocking.py11
-rw-r--r--slixmpp/plugins/xep_0191/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0198/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0198/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0198/stream_management.py11
-rw-r--r--slixmpp/plugins/xep_0199/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0199/ping.py11
-rw-r--r--slixmpp/plugins/xep_0199/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0202/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0202/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0202/time.py11
-rw-r--r--slixmpp/plugins/xep_0203/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0203/delay.py11
-rw-r--r--slixmpp/plugins/xep_0203/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0221/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0221/media.py11
-rw-r--r--slixmpp/plugins/xep_0221/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0222.py11
-rw-r--r--slixmpp/plugins/xep_0223.py11
-rw-r--r--slixmpp/plugins/xep_0224/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0224/attention.py11
-rw-r--r--slixmpp/plugins/xep_0224/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0231/__init__.py13
-rw-r--r--slixmpp/plugins/xep_0231/bob.py13
-rw-r--r--slixmpp/plugins/xep_0231/stanza.py13
-rw-r--r--slixmpp/plugins/xep_0235/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0235/oauth.py11
-rw-r--r--slixmpp/plugins/xep_0235/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0242.py11
-rw-r--r--slixmpp/plugins/xep_0249/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0249/invite.py11
-rw-r--r--slixmpp/plugins/xep_0249/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0256.py11
-rw-r--r--slixmpp/plugins/xep_0256/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0256/last_activity_presence.py11
-rw-r--r--slixmpp/plugins/xep_0257/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0257/client_cert_management.py11
-rw-r--r--slixmpp/plugins/xep_0257/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0258/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0258/security_labels.py11
-rw-r--r--slixmpp/plugins/xep_0258/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0270.py11
-rw-r--r--slixmpp/plugins/xep_0279/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0279/ipcheck.py11
-rw-r--r--slixmpp/plugins/xep_0279/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0280/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0280/carbons.py11
-rw-r--r--slixmpp/plugins/xep_0280/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0297/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0297/forwarded.py11
-rw-r--r--slixmpp/plugins/xep_0297/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0300/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0300/hash.py11
-rw-r--r--slixmpp/plugins/xep_0300/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0302.py11
-rw-r--r--slixmpp/plugins/xep_0308/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0308/correction.py11
-rw-r--r--slixmpp/plugins/xep_0308/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0313/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0313/mam.py11
-rw-r--r--slixmpp/plugins/xep_0313/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0319/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0319/idle.py11
-rw-r--r--slixmpp/plugins/xep_0319/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0323/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0323/device.py15
-rw-r--r--slixmpp/plugins/xep_0323/sensordata.py15
-rw-r--r--slixmpp/plugins/xep_0323/stanza/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0323/stanza/base.py15
-rw-r--r--slixmpp/plugins/xep_0323/stanza/sensordata.py15
-rw-r--r--slixmpp/plugins/xep_0323/timerreset.py15
-rw-r--r--slixmpp/plugins/xep_0325/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0325/control.py15
-rw-r--r--slixmpp/plugins/xep_0325/device.py15
-rw-r--r--slixmpp/plugins/xep_0325/stanza/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0325/stanza/base.py15
-rw-r--r--slixmpp/plugins/xep_0325/stanza/control.py15
-rw-r--r--slixmpp/plugins/xep_0332/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0332/http.py15
-rw-r--r--slixmpp/plugins/xep_0332/stanza/__init__.py15
-rw-r--r--slixmpp/plugins/xep_0332/stanza/data.py15
-rw-r--r--slixmpp/plugins/xep_0332/stanza/request.py15
-rw-r--r--slixmpp/plugins/xep_0332/stanza/response.py15
-rw-r--r--slixmpp/plugins/xep_0333/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0333/markers.py11
-rw-r--r--slixmpp/plugins/xep_0333/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0334/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0334/hints.py11
-rw-r--r--slixmpp/plugins/xep_0335/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0335/json_containers.py11
-rw-r--r--slixmpp/plugins/xep_0335/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0352/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0352/csi.py11
-rw-r--r--slixmpp/plugins/xep_0352/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0353/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0353/jingle_message.py11
-rw-r--r--slixmpp/plugins/xep_0353/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0359/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0359/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0359/stanzaid.py11
-rw-r--r--slixmpp/plugins/xep_0363/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0363/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0369/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0369/mix_core.py11
-rw-r--r--slixmpp/plugins/xep_0369/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0377/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0377/spam_reporting.py11
-rw-r--r--slixmpp/plugins/xep_0377/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0380/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0380/eme.py11
-rw-r--r--slixmpp/plugins/xep_0380/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0382/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0382/spoiler.py11
-rw-r--r--slixmpp/plugins/xep_0382/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0394/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0394/markup.py11
-rw-r--r--slixmpp/plugins/xep_0394/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0403/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0403/mix_presence.py11
-rw-r--r--slixmpp/plugins/xep_0403/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0404/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0404/mix_anon.py11
-rw-r--r--slixmpp/plugins/xep_0404/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0405/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0405/mix_pam.py11
-rw-r--r--slixmpp/plugins/xep_0405/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0421/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0421/occupant_id.py11
-rw-r--r--slixmpp/plugins/xep_0421/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0422/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0422/fastening.py11
-rw-r--r--slixmpp/plugins/xep_0422/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0424/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0424/retraction.py11
-rw-r--r--slixmpp/plugins/xep_0424/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0425/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0425/moderation.py11
-rw-r--r--slixmpp/plugins/xep_0425/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0428/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0428/fallback.py11
-rw-r--r--slixmpp/plugins/xep_0428/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0437/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0437/rai.py11
-rw-r--r--slixmpp/plugins/xep_0437/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0439/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0439/quickresponse.py11
-rw-r--r--slixmpp/plugins/xep_0439/stanza.py11
-rw-r--r--slixmpp/plugins/xep_0444/__init__.py11
-rw-r--r--slixmpp/plugins/xep_0444/reactions.py11
-rw-r--r--slixmpp/plugins/xep_0444/stanza.py11
-rw-r--r--slixmpp/roster/__init__.py11
-rw-r--r--slixmpp/roster/item.py11
-rw-r--r--slixmpp/roster/multi.py11
-rw-r--r--slixmpp/roster/single.py11
-rw-r--r--slixmpp/stanza/__init__.py11
-rw-r--r--slixmpp/stanza/atom.py11
-rw-r--r--slixmpp/stanza/error.py11
-rw-r--r--slixmpp/stanza/htmlim.py11
-rw-r--r--slixmpp/stanza/iq.py11
-rw-r--r--slixmpp/stanza/message.py11
-rw-r--r--slixmpp/stanza/presence.py11
-rw-r--r--slixmpp/stanza/rootstanza.py11
-rw-r--r--slixmpp/stanza/roster.py11
-rw-r--r--slixmpp/stanza/stream_error.py11
-rw-r--r--slixmpp/stanza/stream_features.py11
-rw-r--r--slixmpp/stringprep.py18
-rw-r--r--slixmpp/test/__init__.py11
-rw-r--r--slixmpp/test/integration.py11
-rw-r--r--slixmpp/test/livesocket.py11
-rw-r--r--slixmpp/test/mocksocket.py11
-rw-r--r--slixmpp/test/slixtest.py11
-rw-r--r--slixmpp/util/__init__.py15
-rw-r--r--slixmpp/util/cache.py11
-rw-r--r--slixmpp/util/sasl/__init__.py21
-rw-r--r--slixmpp/util/sasl/client.py21
-rw-r--r--slixmpp/util/sasl/mechanisms.py24
-rw-r--r--slixmpp/util/stringprep_profiles.py22
-rw-r--r--slixmpp/version.py11
-rw-r--r--slixmpp/xmlstream/__init__.py11
-rw-r--r--slixmpp/xmlstream/handler/__init__.py11
-rw-r--r--slixmpp/xmlstream/handler/base.py15
-rw-r--r--slixmpp/xmlstream/handler/callback.py15
-rw-r--r--slixmpp/xmlstream/handler/collector.py15
-rw-r--r--slixmpp/xmlstream/handler/coroutine_callback.py15
-rw-r--r--slixmpp/xmlstream/handler/waiter.py15
-rw-r--r--slixmpp/xmlstream/handler/xmlcallback.py11
-rw-r--r--slixmpp/xmlstream/handler/xmlwaiter.py11
-rw-r--r--slixmpp/xmlstream/matcher/__init__.py11
-rw-r--r--slixmpp/xmlstream/matcher/base.py15
-rw-r--r--slixmpp/xmlstream/matcher/id.py15
-rw-r--r--slixmpp/xmlstream/matcher/idsender.py15
-rw-r--r--slixmpp/xmlstream/matcher/many.py11
-rw-r--r--slixmpp/xmlstream/matcher/stanzapath.py15
-rw-r--r--slixmpp/xmlstream/matcher/xmlmask.py11
-rw-r--r--slixmpp/xmlstream/matcher/xpath.py15
-rw-r--r--slixmpp/xmlstream/resolver.py12
-rw-r--r--slixmpp/xmlstream/stanzabase.py20
-rw-r--r--slixmpp/xmlstream/tostring.py22
-rw-r--r--slixmpp/xmlstream/xmlstream.py21
414 files changed, 1748 insertions, 3090 deletions
diff --git a/examples/IoT_TestDevice.py b/examples/IoT_TestDevice.py
index d8e8fd06..0d50c714 100755
--- a/examples/IoT_TestDevice.py
+++ b/examples/IoT_TestDevice.py
@@ -1,15 +1,11 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
@@ -179,4 +175,3 @@ if __name__ == '__main__':
else:
print("noopp didn't happen")
-
diff --git a/examples/adhoc_provider.py b/examples/adhoc_provider.py
index d2c3afd6..6c667777 100755
--- a/examples/adhoc_provider.py
+++ b/examples/adhoc_provider.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/adhoc_user.py b/examples/adhoc_user.py
index 931ef71c..0b9e8cef 100755
--- a/examples/adhoc_user.py
+++ b/examples/adhoc_user.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/admin_commands.py b/examples/admin_commands.py
index 64c48913..b5df309d 100755
--- a/examples/admin_commands.py
+++ b/examples/admin_commands.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/confirm_answer.py b/examples/confirm_answer.py
index f2c4c273..342647e9 100755
--- a/examples/confirm_answer.py
+++ b/examples/confirm_answer.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/confirm_ask.py b/examples/confirm_ask.py
index 27fdfde7..5b663054 100755
--- a/examples/confirm_ask.py
+++ b/examples/confirm_ask.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import sys
diff --git a/examples/custom_stanzas/custom_stanza_provider.py b/examples/custom_stanzas/custom_stanza_provider.py
index bca4a904..78497f32 100755
--- a/examples/custom_stanzas/custom_stanza_provider.py
+++ b/examples/custom_stanzas/custom_stanza_provider.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/custom_stanzas/custom_stanza_user.py b/examples/custom_stanzas/custom_stanza_user.py
index 4119aa97..121f31b8 100755
--- a/examples/custom_stanzas/custom_stanza_user.py
+++ b/examples/custom_stanzas/custom_stanza_user.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/disco_browser.py b/examples/disco_browser.py
index 02d51259..25f9b8f3 100755
--- a/examples/disco_browser.py
+++ b/examples/disco_browser.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/download_avatars.py b/examples/download_avatars.py
index 37733b01..3eb8f29d 100755
--- a/examples/download_avatars.py
+++ b/examples/download_avatars.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/echo_client.py b/examples/echo_client.py
index 2a3337a5..2f3e11fc 100755
--- a/examples/echo_client.py
+++ b/examples/echo_client.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/echo_component.py b/examples/echo_component.py
index 664fe311..7bf09ed4 100755
--- a/examples/echo_component.py
+++ b/examples/echo_component.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/gtalk_custom_domain.py b/examples/gtalk_custom_domain.py
index c8d80e96..95fe238a 100755
--- a/examples/gtalk_custom_domain.py
+++ b/examples/gtalk_custom_domain.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/http_over_xmpp.py b/examples/http_over_xmpp.py
index 013f301b..9af708ad 100644
--- a/examples/http_over_xmpp.py
+++ b/examples/http_over_xmpp.py
@@ -1,15 +1,11 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import ClientXMPP
@@ -94,4 +90,3 @@ if __name__ == '__main__':
xmpp = HTTPOverXMPPClient(args.jid, args.password)
xmpp.connect()
xmpp.process()
-
diff --git a/examples/http_upload.py b/examples/http_upload.py
index 268a22dc..f74b5b10 100755
--- a/examples/http_upload.py
+++ b/examples/http_upload.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/ibb_transfer/ibb_receiver.py b/examples/ibb_transfer/ibb_receiver.py
index e934f295..1ab15634 100755
--- a/examples/ibb_transfer/ibb_receiver.py
+++ b/examples/ibb_transfer/ibb_receiver.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/ibb_transfer/ibb_sender.py b/examples/ibb_transfer/ibb_sender.py
index 8600ac80..df930c28 100755
--- a/examples/ibb_transfer/ibb_sender.py
+++ b/examples/ibb_transfer/ibb_sender.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/mam.py b/examples/mam.py
index cd6b738a..7d388e04 100755
--- a/examples/mam.py
+++ b/examples/mam.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/markup.py b/examples/markup.py
index 4c850ec8..7546c3aa 100755
--- a/examples/markup.py
+++ b/examples/markup.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/mix.py b/examples/mix.py
index 1c3a34ae..f9afdf85 100755
--- a/examples/mix.py
+++ b/examples/mix.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2021 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2021 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/muc.py b/examples/muc.py
index 62e8e898..5506c6e0 100755
--- a/examples/muc.py
+++ b/examples/muc.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/ping.py b/examples/ping.py
index 7870715c..c8330cd8 100755
--- a/examples/ping.py
+++ b/examples/ping.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/pubsub_client.py b/examples/pubsub_client.py
index e285dfc8..93586a33 100755
--- a/examples/pubsub_client.py
+++ b/examples/pubsub_client.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
import logging
from getpass import getpass
diff --git a/examples/pubsub_events.py b/examples/pubsub_events.py
index 2b3a1e65..4950f49d 100755
--- a/examples/pubsub_events.py
+++ b/examples/pubsub_events.py
@@ -1,5 +1,4 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
import logging
from getpass import getpass
diff --git a/examples/register_account.py b/examples/register_account.py
index 9ab0c664..55811840 100755
--- a/examples/register_account.py
+++ b/examples/register_account.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/roster_browser.py b/examples/roster_browser.py
index e9365d09..4f53ac61 100755
--- a/examples/roster_browser.py
+++ b/examples/roster_browser.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/rpc_async.py b/examples/rpc_async.py
index f773a8d1..ec857529 100755
--- a/examples/rpc_async.py
+++ b/examples/rpc_async.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Dann Martens
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Dann Martens
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
ANY_ALL, Future
@@ -44,4 +40,3 @@ def main():
if __name__ == '__main__':
main()
-
diff --git a/examples/rpc_client_side.py b/examples/rpc_client_side.py
index 0a4ba015..bf76701d 100755
--- a/examples/rpc_client_side.py
+++ b/examples/rpc_client_side.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Dann Martens
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Dann Martens
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
ANY_ALL
@@ -53,4 +49,3 @@ def main():
if __name__ == '__main__':
main()
-
diff --git a/examples/rpc_server_side.py b/examples/rpc_server_side.py
index b973e53b..efbb8d93 100755
--- a/examples/rpc_server_side.py
+++ b/examples/rpc_server_side.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Dann Martens
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Dann Martens
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0009.remote import Endpoint, remote, Remote, \
ANY_ALL
@@ -52,4 +48,3 @@ def main():
if __name__ == '__main__':
main()
-
diff --git a/examples/s5b_transfer/s5b_receiver.py b/examples/s5b_transfer/s5b_receiver.py
index d97d4777..cdc7d6dc 100755
--- a/examples/s5b_transfer/s5b_receiver.py
+++ b/examples/s5b_transfer/s5b_receiver.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/s5b_transfer/s5b_sender.py b/examples/s5b_transfer/s5b_sender.py
index 7ef5c99c..a8be52fb 100755
--- a/examples/s5b_transfer/s5b_sender.py
+++ b/examples/s5b_transfer/s5b_sender.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/send_client.py b/examples/send_client.py
index 5d5fb810..fc644df7 100755
--- a/examples/send_client.py
+++ b/examples/send_client.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from getpass import getpass
diff --git a/examples/set_avatar.py b/examples/set_avatar.py
index 3188e9d8..2b3c1987 100755
--- a/examples/set_avatar.py
+++ b/examples/set_avatar.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import os
import imghdr
diff --git a/examples/thirdparty_auth.py b/examples/thirdparty_auth.py
index b2623972..2c2e741f 100755
--- a/examples/thirdparty_auth.py
+++ b/examples/thirdparty_auth.py
@@ -1,13 +1,9 @@
#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import sys
import logging
diff --git a/slixmpp/__init__.py b/slixmpp/__init__.py
index caa39db7..94cd85cc 100644
--- a/slixmpp/__init__.py
+++ b/slixmpp/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
logging.getLogger(__name__).addHandler(logging.NullHandler())
diff --git a/slixmpp/basexmpp.py b/slixmpp/basexmpp.py
index 47633d8f..e94883b1 100644
--- a/slixmpp/basexmpp.py
+++ b/slixmpp/basexmpp.py
@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.basexmpp
- ~~~~~~~~~~~~~~~~~~
-
- This module provides the common XMPP functionality
- for both clients and components.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.basexmpp
+# ~~~~~~~~~~~~~~~~~~
+# This module provides the common XMPP functionality
+# for both clients and components.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from __future__ import annotations
import asyncio
diff --git a/slixmpp/clientxmpp.py b/slixmpp/clientxmpp.py
index 2b0e8536..37b4c590 100644
--- a/slixmpp/clientxmpp.py
+++ b/slixmpp/clientxmpp.py
@@ -1,17 +1,11 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.clientxmpp
- ~~~~~~~~~~~~~~~~~~~~
-
- This module provides XMPP functionality that
- is specific to client connections.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.clientxmpp
+# ~~~~~~~~~~~~~~~~~~~~
+# This module provides XMPP functionality that
+# is specific to client connections.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import asyncio
import logging
diff --git a/slixmpp/componentxmpp.py b/slixmpp/componentxmpp.py
index 868798d1..3a16f942 100644
--- a/slixmpp/componentxmpp.py
+++ b/slixmpp/componentxmpp.py
@@ -1,17 +1,11 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.clientxmpp
- ~~~~~~~~~~~~~~~~~~~~
-
- This module provides XMPP functionality that
- is specific to external server component connections.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.clientxmpp
+# ~~~~~~~~~~~~~~~~~~~~
+# This module provides XMPP functionality that
+# is specific to external server component connections.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import logging
import hashlib
diff --git a/slixmpp/exceptions.py b/slixmpp/exceptions.py
index 5ec6e7e1..0df79a00 100644
--- a/slixmpp/exceptions.py
+++ b/slixmpp/exceptions.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.exceptions
- ~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.exceptions
+# ~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
class XMPPError(Exception):
diff --git a/slixmpp/features/__init__.py b/slixmpp/features/__init__.py
index 5b728ee8..142d2343 100644
--- a/slixmpp/features/__init__.py
+++ b/slixmpp/features/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
__all__ = [
'feature_starttls',
'feature_mechanisms',
diff --git a/slixmpp/features/feature_bind/__init__.py b/slixmpp/features/feature_bind/__init__.py
index 2b40655b..0be88fb8 100644
--- a/slixmpp/features/feature_bind/__init__.py
+++ b/slixmpp/features/feature_bind/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_bind.bind import FeatureBind
diff --git a/slixmpp/features/feature_bind/bind.py b/slixmpp/features/feature_bind/bind.py
index bd2a3b99..6c30d9f2 100644
--- a/slixmpp/features/feature_bind/bind.py
+++ b/slixmpp/features/feature_bind/bind.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import logging
diff --git a/slixmpp/features/feature_bind/stanza.py b/slixmpp/features/feature_bind/stanza.py
index 96c3e757..29a5743a 100644
--- a/slixmpp/features/feature_bind/stanza.py
+++ b/slixmpp/features/feature_bind/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/features/feature_mechanisms/__init__.py b/slixmpp/features/feature_mechanisms/__init__.py
index 5c51d955..587f37de 100644
--- a/slixmpp/features/feature_mechanisms/__init__.py
+++ b/slixmpp/features/feature_mechanisms/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_mechanisms.mechanisms import FeatureMechanisms
diff --git a/slixmpp/features/feature_mechanisms/mechanisms.py b/slixmpp/features/feature_mechanisms/mechanisms.py
index 26af1947..dfdca010 100644
--- a/slixmpp/features/feature_mechanisms/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/mechanisms.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import ssl
import logging
diff --git a/slixmpp/features/feature_mechanisms/stanza/__init__.py b/slixmpp/features/feature_mechanisms/stanza/__init__.py
index 4d515bf2..159440c3 100644
--- a/slixmpp/features/feature_mechanisms/stanza/__init__.py
+++ b/slixmpp/features/feature_mechanisms/stanza/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.features.feature_mechanisms.stanza.mechanisms import Mechanisms
from slixmpp.features.feature_mechanisms.stanza.auth import Auth
diff --git a/slixmpp/features/feature_mechanisms/stanza/abort.py b/slixmpp/features/feature_mechanisms/stanza/abort.py
index fca29aee..afa75cde 100644
--- a/slixmpp/features/feature_mechanisms/stanza/abort.py
+++ b/slixmpp/features/feature_mechanisms/stanza/abort.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import StanzaBase
diff --git a/slixmpp/features/feature_mechanisms/stanza/auth.py b/slixmpp/features/feature_mechanisms/stanza/auth.py
index 48f0cf81..b1fbffa9 100644
--- a/slixmpp/features/feature_mechanisms/stanza/auth.py
+++ b/slixmpp/features/feature_mechanisms/stanza/auth.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import base64
from slixmpp.util import bytes
diff --git a/slixmpp/features/feature_mechanisms/stanza/challenge.py b/slixmpp/features/feature_mechanisms/stanza/challenge.py
index 7fa76e18..9a141f85 100644
--- a/slixmpp/features/feature_mechanisms/stanza/challenge.py
+++ b/slixmpp/features/feature_mechanisms/stanza/challenge.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import base64
from slixmpp.util import bytes
diff --git a/slixmpp/features/feature_mechanisms/stanza/failure.py b/slixmpp/features/feature_mechanisms/stanza/failure.py
index adc686b7..6485170a 100644
--- a/slixmpp/features/feature_mechanisms/stanza/failure.py
+++ b/slixmpp/features/feature_mechanisms/stanza/failure.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import StanzaBase, ET
diff --git a/slixmpp/features/feature_mechanisms/stanza/mechanisms.py b/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
index 4ff15678..bc978460 100644
--- a/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
+++ b/slixmpp/features/feature_mechanisms/stanza/mechanisms.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/features/feature_mechanisms/stanza/response.py b/slixmpp/features/feature_mechanisms/stanza/response.py
index b25a0592..4df0c496 100644
--- a/slixmpp/features/feature_mechanisms/stanza/response.py
+++ b/slixmpp/features/feature_mechanisms/stanza/response.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import base64
from slixmpp.util import bytes
diff --git a/slixmpp/features/feature_mechanisms/stanza/success.py b/slixmpp/features/feature_mechanisms/stanza/success.py
index 70be1780..e5ecb47b 100644
--- a/slixmpp/features/feature_mechanisms/stanza/success.py
+++ b/slixmpp/features/feature_mechanisms/stanza/success.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import base64
from slixmpp.util import bytes
diff --git a/slixmpp/features/feature_preapproval/__init__.py b/slixmpp/features/feature_preapproval/__init__.py
index f22be050..bf81b3d9 100644
--- a/slixmpp/features/feature_preapproval/__init__.py
+++ b/slixmpp/features/feature_preapproval/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_preapproval.preapproval import FeaturePreApproval
diff --git a/slixmpp/features/feature_preapproval/preapproval.py b/slixmpp/features/feature_preapproval/preapproval.py
index 1d60d7e7..5dceeb06 100644
--- a/slixmpp/features/feature_preapproval/preapproval.py
+++ b/slixmpp/features/feature_preapproval/preapproval.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import StreamFeatures
diff --git a/slixmpp/features/feature_preapproval/stanza.py b/slixmpp/features/feature_preapproval/stanza.py
index 03d721ef..b5d68f8e 100644
--- a/slixmpp/features/feature_preapproval/stanza.py
+++ b/slixmpp/features/feature_preapproval/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/features/feature_rosterver/__init__.py b/slixmpp/features/feature_rosterver/__init__.py
index 3696e68d..6330d39b 100644
--- a/slixmpp/features/feature_rosterver/__init__.py
+++ b/slixmpp/features/feature_rosterver/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_rosterver.rosterver import FeatureRosterVer
diff --git a/slixmpp/features/feature_rosterver/rosterver.py b/slixmpp/features/feature_rosterver/rosterver.py
index 2c2c8c84..ae980388 100644
--- a/slixmpp/features/feature_rosterver/rosterver.py
+++ b/slixmpp/features/feature_rosterver/rosterver.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import StreamFeatures
diff --git a/slixmpp/features/feature_rosterver/stanza.py b/slixmpp/features/feature_rosterver/stanza.py
index c9a4a2da..3696d89a 100644
--- a/slixmpp/features/feature_rosterver/stanza.py
+++ b/slixmpp/features/feature_rosterver/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/features/feature_session/__init__.py b/slixmpp/features/feature_session/__init__.py
index 9d334193..b2e4a15e 100644
--- a/slixmpp/features/feature_session/__init__.py
+++ b/slixmpp/features/feature_session/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_session.session import FeatureSession
diff --git a/slixmpp/features/feature_session/session.py b/slixmpp/features/feature_session/session.py
index 643c34ef..0f9b9dd7 100644
--- a/slixmpp/features/feature_session/session.py
+++ b/slixmpp/features/feature_session/session.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import logging
diff --git a/slixmpp/features/feature_session/stanza.py b/slixmpp/features/feature_session/stanza.py
index 4ed8c4db..538f578d 100644
--- a/slixmpp/features/feature_session/stanza.py
+++ b/slixmpp/features/feature_session/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/features/feature_starttls/__init__.py b/slixmpp/features/feature_starttls/__init__.py
index 99606ecd..e3b8052a 100644
--- a/slixmpp/features/feature_starttls/__init__.py
+++ b/slixmpp/features/feature_starttls/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.features.feature_starttls.starttls import FeatureSTARTTLS
diff --git a/slixmpp/features/feature_starttls/stanza.py b/slixmpp/features/feature_starttls/stanza.py
index ba58d93e..5552cf61 100644
--- a/slixmpp/features/feature_starttls/stanza.py
+++ b/slixmpp/features/feature_starttls/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import StanzaBase, ElementBase
diff --git a/slixmpp/features/feature_starttls/starttls.py b/slixmpp/features/feature_starttls/starttls.py
index 7e3af992..fe793a2d 100644
--- a/slixmpp/features/feature_starttls/starttls.py
+++ b/slixmpp/features/feature_starttls/starttls.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import StreamFeatures
diff --git a/slixmpp/jid.py b/slixmpp/jid.py
index 5d39a444..c84b4aa0 100644
--- a/slixmpp/jid.py
+++ b/slixmpp/jid.py
@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.jid
- ~~~~~~~~~~~~~~~~~~~~~~~
-
- This module allows for working with Jabber IDs (JIDs).
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.jid
+# ~~~~~~~~~~~~~~~~~~~~~~~
+# This module allows for working with Jabber IDs (JIDs).
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import re
import socket
diff --git a/slixmpp/plugins/__init__.py b/slixmpp/plugins/__init__.py
index e833d808..70ec55d2 100644
--- a/slixmpp/plugins/__init__.py
+++ b/slixmpp/plugins/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import PluginManager, PluginNotFound, BasePlugin
from slixmpp.plugins.base import register_plugin, load_plugin
diff --git a/slixmpp/plugins/base.py b/slixmpp/plugins/base.py
index 3196e0ea..afdb5339 100644
--- a/slixmpp/plugins/base.py
+++ b/slixmpp/plugins/base.py
@@ -1,17 +1,11 @@
-# -*- encoding: utf-8 -*-
-"""
- slixmpp.plugins.base
- ~~~~~~~~~~~~~~~~~~~~~~
-
- This module provides XMPP functionality that
- is specific to client connections.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2012 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.plugins.base
+# ~~~~~~~~~~~~~~~~~~~~~~
+# This module provides XMPP functionality that
+# is specific to client connections.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2012 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import sys
import copy
diff --git a/slixmpp/plugins/gmail_notify.py b/slixmpp/plugins/gmail_notify.py
index a56ca699..4fa0d0db 100644
--- a/slixmpp/plugins/gmail_notify.py
+++ b/slixmpp/plugins/gmail_notify.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.plugins import BasePlugin
from .. xmlstream.handler.callback import Callback
diff --git a/slixmpp/plugins/google/__init__.py b/slixmpp/plugins/google/__init__.py
index 657f90b0..4ab91ed7 100644
--- a/slixmpp/plugins/google/__init__.py
+++ b/slixmpp/plugins/google/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin, BasePlugin
from slixmpp.plugins.google.gmail import Gmail
diff --git a/slixmpp/plugins/google/auth/__init__.py b/slixmpp/plugins/google/auth/__init__.py
index 624ffc48..c439e49c 100644
--- a/slixmpp/plugins/google/auth/__init__.py
+++ b/slixmpp/plugins/google/auth/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.google.auth import stanza
from slixmpp.plugins.google.auth.auth import GoogleAuth
diff --git a/slixmpp/plugins/google/auth/auth.py b/slixmpp/plugins/google/auth/auth.py
index 71a25ae4..b791f88d 100644
--- a/slixmpp/plugins/google/auth/auth.py
+++ b/slixmpp/plugins/google/auth/auth.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.google.auth import stanza
diff --git a/slixmpp/plugins/google/auth/stanza.py b/slixmpp/plugins/google/auth/stanza.py
index 5b1b7862..bc793bd0 100644
--- a/slixmpp/plugins/google/auth/stanza.py
+++ b/slixmpp/plugins/google/auth/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/google/gmail/__init__.py b/slixmpp/plugins/google/gmail/__init__.py
index ad575a3c..41e6c6a0 100644
--- a/slixmpp/plugins/google/gmail/__init__.py
+++ b/slixmpp/plugins/google/gmail/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.google.gmail import stanza
from slixmpp.plugins.google.gmail.notifications import Gmail
diff --git a/slixmpp/plugins/google/gmail/notifications.py b/slixmpp/plugins/google/gmail/notifications.py
index e6785ccb..8284ad25 100644
--- a/slixmpp/plugins/google/gmail/notifications.py
+++ b/slixmpp/plugins/google/gmail/notifications.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import Iq
diff --git a/slixmpp/plugins/google/gmail/stanza.py b/slixmpp/plugins/google/gmail/stanza.py
index e4086551..489ccd91 100644
--- a/slixmpp/plugins/google/gmail/stanza.py
+++ b/slixmpp/plugins/google/gmail/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/google/nosave/__init__.py b/slixmpp/plugins/google/nosave/__init__.py
index 467e980a..eb711edb 100644
--- a/slixmpp/plugins/google/nosave/__init__.py
+++ b/slixmpp/plugins/google/nosave/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.google.nosave import stanza
from slixmpp.plugins.google.nosave.nosave import GoogleNoSave
diff --git a/slixmpp/plugins/google/nosave/nosave.py b/slixmpp/plugins/google/nosave/nosave.py
index 7387f4df..3dc6aeef 100644
--- a/slixmpp/plugins/google/nosave/nosave.py
+++ b/slixmpp/plugins/google/nosave/nosave.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Iq, Message
from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath
diff --git a/slixmpp/plugins/google/nosave/stanza.py b/slixmpp/plugins/google/nosave/stanza.py
index 2281c91e..f06ed7a9 100644
--- a/slixmpp/plugins/google/nosave/stanza.py
+++ b/slixmpp/plugins/google/nosave/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.jid import JID
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/google/settings/__init__.py b/slixmpp/plugins/google/settings/__init__.py
index 6cefdae9..9a97563a 100644
--- a/slixmpp/plugins/google/settings/__init__.py
+++ b/slixmpp/plugins/google/settings/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.google.settings import stanza
from slixmpp.plugins.google.settings.settings import GoogleSettings
diff --git a/slixmpp/plugins/google/settings/settings.py b/slixmpp/plugins/google/settings/settings.py
index 84a8dfa9..baf3bce7 100644
--- a/slixmpp/plugins/google/settings/settings.py
+++ b/slixmpp/plugins/google/settings/settings.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Iq
from slixmpp.xmlstream.handler import Callback
from slixmpp.xmlstream.matcher import StanzaPath
diff --git a/slixmpp/plugins/google/settings/stanza.py b/slixmpp/plugins/google/settings/stanza.py
index de66ade4..d26ba2f9 100644
--- a/slixmpp/plugins/google/settings/stanza.py
+++ b/slixmpp/plugins/google/settings/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET, ElementBase
diff --git a/slixmpp/plugins/xep_0004/__init__.py b/slixmpp/plugins/xep_0004/__init__.py
index 874ba465..889654eb 100644
--- a/slixmpp/plugins/xep_0004/__init__.py
+++ b/slixmpp/plugins/xep_0004/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0004.stanza import Form
diff --git a/slixmpp/plugins/xep_0004/dataforms.py b/slixmpp/plugins/xep_0004/dataforms.py
index 857bbd1c..0270407b 100644
--- a/slixmpp/plugins/xep_0004/dataforms.py
+++ b/slixmpp/plugins/xep_0004/dataforms.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Message
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.xmlstream.handler import Callback
diff --git a/slixmpp/plugins/xep_0004/stanza/__init__.py b/slixmpp/plugins/xep_0004/stanza/__init__.py
index 9daaab75..e3bfee8e 100644
--- a/slixmpp/plugins/xep_0004/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0004/stanza/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0004.stanza.field import FormField, FieldOption
from slixmpp.plugins.xep_0004.stanza.form import Form
diff --git a/slixmpp/plugins/xep_0004/stanza/field.py b/slixmpp/plugins/xep_0004/stanza/field.py
index c186157d..f4bbe2ff 100644
--- a/slixmpp/plugins/xep_0004/stanza/field.py
+++ b/slixmpp/plugins/xep_0004/stanza/field.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0004/stanza/form.py b/slixmpp/plugins/xep_0004/stanza/form.py
index 526911db..9af96a4c 100644
--- a/slixmpp/plugins/xep_0004/stanza/form.py
+++ b/slixmpp/plugins/xep_0004/stanza/form.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import copy
import logging
diff --git a/slixmpp/plugins/xep_0009/__init__.py b/slixmpp/plugins/xep_0009/__init__.py
index 2c68a897..abedc677 100644
--- a/slixmpp/plugins/xep_0009/__init__.py
+++ b/slixmpp/plugins/xep_0009/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0009 import stanza
diff --git a/slixmpp/plugins/xep_0009/binding.py b/slixmpp/plugins/xep_0009/binding.py
index 941dd036..ffec5431 100644
--- a/slixmpp/plugins/xep_0009/binding.py
+++ b/slixmpp/plugins/xep_0009/binding.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET
import base64
import logging
diff --git a/slixmpp/plugins/xep_0009/remote.py b/slixmpp/plugins/xep_0009/remote.py
index f3e64fb3..9b0abcd5 100644
--- a/slixmpp/plugins/xep_0009/remote.py
+++ b/slixmpp/plugins/xep_0009/remote.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0009.binding import py2xml, xml2py, xml2fault, fault2xml
from threading import RLock
import abc
diff --git a/slixmpp/plugins/xep_0009/rpc.py b/slixmpp/plugins/xep_0009/rpc.py
index f92844ec..497303a4 100644
--- a/slixmpp/plugins/xep_0009/rpc.py
+++ b/slixmpp/plugins/xep_0009/rpc.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0009/stanza/RPC.py b/slixmpp/plugins/xep_0009/stanza/RPC.py
index 542c839c..b8c91346 100644
--- a/slixmpp/plugins/xep_0009/stanza/RPC.py
+++ b/slixmpp/plugins/xep_0009/stanza/RPC.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.stanzabase import ElementBase
from xml.etree import ElementTree as ET
diff --git a/slixmpp/plugins/xep_0009/stanza/__init__.py b/slixmpp/plugins/xep_0009/stanza/__init__.py
index 79a8a3d7..d9fca605 100644
--- a/slixmpp/plugins/xep_0009/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0009/stanza/__init__.py
@@ -1,9 +1,6 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dann Martens (TOMOTON).
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0009.stanza.RPC import RPCQuery, MethodCall, MethodResponse
diff --git a/slixmpp/plugins/xep_0012/__init__.py b/slixmpp/plugins/xep_0012/__init__.py
index bf8cc775..75aeb315 100644
--- a/slixmpp/plugins/xep_0012/__init__.py
+++ b/slixmpp/plugins/xep_0012/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0012.stanza import LastActivity
diff --git a/slixmpp/plugins/xep_0012/last_activity.py b/slixmpp/plugins/xep_0012/last_activity.py
index bd21252b..27e16e21 100644
--- a/slixmpp/plugins/xep_0012/last_activity.py
+++ b/slixmpp/plugins/xep_0012/last_activity.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from asyncio import Future
from datetime import datetime, timedelta
diff --git a/slixmpp/plugins/xep_0012/stanza.py b/slixmpp/plugins/xep_0012/stanza.py
index 16ca6fcf..1004de64 100644
--- a/slixmpp/plugins/xep_0012/stanza.py
+++ b/slixmpp/plugins/xep_0012/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0013/__init__.py b/slixmpp/plugins/xep_0013/__init__.py
index c02a6c5a..33ca9066 100644
--- a/slixmpp/plugins/xep_0013/__init__.py
+++ b/slixmpp/plugins/xep_0013/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0013.stanza import Offline
diff --git a/slixmpp/plugins/xep_0013/offline.py b/slixmpp/plugins/xep_0013/offline.py
index 7303b0d3..39de69a5 100644
--- a/slixmpp/plugins/xep_0013/offline.py
+++ b/slixmpp/plugins/xep_0013/offline.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0013/stanza.py b/slixmpp/plugins/xep_0013/stanza.py
index 780d1f74..bf1e4080 100644
--- a/slixmpp/plugins/xep_0013/stanza.py
+++ b/slixmpp/plugins/xep_0013/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.jid import JID
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0016/__init__.py b/slixmpp/plugins/xep_0016/__init__.py
index aa95c78d..99527534 100644
--- a/slixmpp/plugins/xep_0016/__init__.py
+++ b/slixmpp/plugins/xep_0016/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0016 import stanza
diff --git a/slixmpp/plugins/xep_0016/privacy.py b/slixmpp/plugins/xep_0016/privacy.py
index 2b8d623d..6682801f 100644
--- a/slixmpp/plugins/xep_0016/privacy.py
+++ b/slixmpp/plugins/xep_0016/privacy.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Iq
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0020/__init__.py b/slixmpp/plugins/xep_0020/__init__.py
index 53d96fe4..c645e6c5 100644
--- a/slixmpp/plugins/xep_0020/__init__.py
+++ b/slixmpp/plugins/xep_0020/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0020 import stanza
diff --git a/slixmpp/plugins/xep_0020/feature_negotiation.py b/slixmpp/plugins/xep_0020/feature_negotiation.py
index b024bf0d..77f9cc12 100644
--- a/slixmpp/plugins/xep_0020/feature_negotiation.py
+++ b/slixmpp/plugins/xep_0020/feature_negotiation.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq, Message
diff --git a/slixmpp/plugins/xep_0020/stanza.py b/slixmpp/plugins/xep_0020/stanza.py
index d9cea8f4..5546e1cd 100644
--- a/slixmpp/plugins/xep_0020/stanza.py
+++ b/slixmpp/plugins/xep_0020/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0027/__init__.py b/slixmpp/plugins/xep_0027/__init__.py
index 1f510cb2..0481597c 100644
--- a/slixmpp/plugins/xep_0027/__init__.py
+++ b/slixmpp/plugins/xep_0027/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0027.stanza import Signed, Encrypted
diff --git a/slixmpp/plugins/xep_0027/gpg.py b/slixmpp/plugins/xep_0027/gpg.py
index a0b1df48..af5df044 100644
--- a/slixmpp/plugins/xep_0027/gpg.py
+++ b/slixmpp/plugins/xep_0027/gpg.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.thirdparty import GPG
from slixmpp.stanza import Presence, Message
diff --git a/slixmpp/plugins/xep_0027/stanza.py b/slixmpp/plugins/xep_0027/stanza.py
index b1fb50be..2aa7a768 100644
--- a/slixmpp/plugins/xep_0027/stanza.py
+++ b/slixmpp/plugins/xep_0027/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0030/__init__.py b/slixmpp/plugins/xep_0030/__init__.py
index 6675ba87..2aaac159 100644
--- a/slixmpp/plugins/xep_0030/__init__.py
+++ b/slixmpp/plugins/xep_0030/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0030 import stanza
diff --git a/slixmpp/plugins/xep_0030/disco.py b/slixmpp/plugins/xep_0030/disco.py
index 10603b81..9c4c5269 100644
--- a/slixmpp/plugins/xep_0030/disco.py
+++ b/slixmpp/plugins/xep_0030/disco.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import logging
diff --git a/slixmpp/plugins/xep_0030/stanza/__init__.py b/slixmpp/plugins/xep_0030/stanza/__init__.py
index bdac9bf2..1ca87b95 100644
--- a/slixmpp/plugins/xep_0030/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0030/stanza/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0030.stanza.info import DiscoInfo
from slixmpp.plugins.xep_0030.stanza.items import DiscoItems
diff --git a/slixmpp/plugins/xep_0030/stanza/info.py b/slixmpp/plugins/xep_0030/stanza/info.py
index 5bb77c03..a77917e9 100644
--- a/slixmpp/plugins/xep_0030/stanza/info.py
+++ b/slixmpp/plugins/xep_0030/stanza/info.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0030/stanza/items.py b/slixmpp/plugins/xep_0030/stanza/items.py
index 5eaf6c4b..d322804c 100644
--- a/slixmpp/plugins/xep_0030/stanza/items.py
+++ b/slixmpp/plugins/xep_0030/stanza/items.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0030/static.py b/slixmpp/plugins/xep_0030/static.py
index 559c8f14..1b5ff2d8 100644
--- a/slixmpp/plugins/xep_0030/static.py
+++ b/slixmpp/plugins/xep_0030/static.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0033/__init__.py b/slixmpp/plugins/xep_0033/__init__.py
index 1d6d9b3a..8003561a 100644
--- a/slixmpp/plugins/xep_0033/__init__.py
+++ b/slixmpp/plugins/xep_0033/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0033 import stanza
diff --git a/slixmpp/plugins/xep_0033/addresses.py b/slixmpp/plugins/xep_0033/addresses.py
index 5fadd44d..b946e958 100644
--- a/slixmpp/plugins/xep_0033/addresses.py
+++ b/slixmpp/plugins/xep_0033/addresses.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Message, Presence
diff --git a/slixmpp/plugins/xep_0033/stanza.py b/slixmpp/plugins/xep_0033/stanza.py
index c3a58037..3b42bebb 100644
--- a/slixmpp/plugins/xep_0033/stanza.py
+++ b/slixmpp/plugins/xep_0033/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import JID, ElementBase, ET, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0045/__init__.py b/slixmpp/plugins/xep_0045/__init__.py
index eb13b018..d2d01405 100644
--- a/slixmpp/plugins/xep_0045/__init__.py
+++ b/slixmpp/plugins/xep_0045/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import register_plugin
from slixmpp.plugins.xep_0045 import stanza
from slixmpp.plugins.xep_0045.muc import XEP_0045
diff --git a/slixmpp/plugins/xep_0045/muc.py b/slixmpp/plugins/xep_0045/muc.py
index ab67d4bc..db24addf 100644
--- a/slixmpp/plugins/xep_0045/muc.py
+++ b/slixmpp/plugins/xep_0045/muc.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from __future__ import with_statement
import asyncio
diff --git a/slixmpp/plugins/xep_0045/stanza.py b/slixmpp/plugins/xep_0045/stanza.py
index 65c7dafe..71eb3fb5 100644
--- a/slixmpp/plugins/xep_0045/stanza.py
+++ b/slixmpp/plugins/xep_0045/stanza.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
Iterable,
Set,
diff --git a/slixmpp/plugins/xep_0047/__init__.py b/slixmpp/plugins/xep_0047/__init__.py
index 06978c37..27d26139 100644
--- a/slixmpp/plugins/xep_0047/__init__.py
+++ b/slixmpp/plugins/xep_0047/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0047 import stanza
diff --git a/slixmpp/plugins/xep_0048/__init__.py b/slixmpp/plugins/xep_0048/__init__.py
index d19f12a3..8a2d86bc 100644
--- a/slixmpp/plugins/xep_0048/__init__.py
+++ b/slixmpp/plugins/xep_0048/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0048.stanza import Bookmarks, Conference, URL
diff --git a/slixmpp/plugins/xep_0048/bookmarks.py b/slixmpp/plugins/xep_0048/bookmarks.py
index bde7ef98..5686f9a6 100644
--- a/slixmpp/plugins/xep_0048/bookmarks.py
+++ b/slixmpp/plugins/xep_0048/bookmarks.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0048/stanza.py b/slixmpp/plugins/xep_0048/stanza.py
index 7a2af4ee..61a85e95 100644
--- a/slixmpp/plugins/xep_0048/stanza.py
+++ b/slixmpp/plugins/xep_0048/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import JID
from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0049/__init__.py b/slixmpp/plugins/xep_0049/__init__.py
index 396be75d..8bdb4223 100644
--- a/slixmpp/plugins/xep_0049/__init__.py
+++ b/slixmpp/plugins/xep_0049/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0049.stanza import PrivateXML
diff --git a/slixmpp/plugins/xep_0049/private_storage.py b/slixmpp/plugins/xep_0049/private_storage.py
index 22286f92..0547ce2d 100644
--- a/slixmpp/plugins/xep_0049/private_storage.py
+++ b/slixmpp/plugins/xep_0049/private_storage.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import (
List,
diff --git a/slixmpp/plugins/xep_0049/stanza.py b/slixmpp/plugins/xep_0049/stanza.py
index a8d425ba..f8374378 100644
--- a/slixmpp/plugins/xep_0049/stanza.py
+++ b/slixmpp/plugins/xep_0049/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET, ElementBase
diff --git a/slixmpp/plugins/xep_0050/__init__.py b/slixmpp/plugins/xep_0050/__init__.py
index b1072a52..41301db4 100644
--- a/slixmpp/plugins/xep_0050/__init__.py
+++ b/slixmpp/plugins/xep_0050/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0050.stanza import Command
diff --git a/slixmpp/plugins/xep_0050/adhoc.py b/slixmpp/plugins/xep_0050/adhoc.py
index e116e4f0..5f3bc81c 100644
--- a/slixmpp/plugins/xep_0050/adhoc.py
+++ b/slixmpp/plugins/xep_0050/adhoc.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import time
diff --git a/slixmpp/plugins/xep_0050/stanza.py b/slixmpp/plugins/xep_0050/stanza.py
index 9e900d48..bc8cd43d 100644
--- a/slixmpp/plugins/xep_0050/stanza.py
+++ b/slixmpp/plugins/xep_0050/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0054/__init__.py b/slixmpp/plugins/xep_0054/__init__.py
index 2029b41f..792b3484 100644
--- a/slixmpp/plugins/xep_0054/__init__.py
+++ b/slixmpp/plugins/xep_0054/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0054.stanza import VCardTemp
diff --git a/slixmpp/plugins/xep_0054/vcard_temp.py b/slixmpp/plugins/xep_0054/vcard_temp.py
index 12840052..5651b611 100644
--- a/slixmpp/plugins/xep_0054/vcard_temp.py
+++ b/slixmpp/plugins/xep_0054/vcard_temp.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from asyncio import Future
from typing import Optional
diff --git a/slixmpp/plugins/xep_0059/__init__.py b/slixmpp/plugins/xep_0059/__init__.py
index e1624e53..d4fd9a81 100644
--- a/slixmpp/plugins/xep_0059/__init__.py
+++ b/slixmpp/plugins/xep_0059/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0059.stanza import Set
diff --git a/slixmpp/plugins/xep_0059/rsm.py b/slixmpp/plugins/xep_0059/rsm.py
index a7aaa7ce..0fd6b2f9 100644
--- a/slixmpp/plugins/xep_0059/rsm.py
+++ b/slixmpp/plugins/xep_0059/rsm.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0059/stanza.py b/slixmpp/plugins/xep_0059/stanza.py
index e1942ee4..c6878fcb 100644
--- a/slixmpp/plugins/xep_0059/stanza.py
+++ b/slixmpp/plugins/xep_0059/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
from slixmpp.plugins.xep_0030.stanza.items import DiscoItems
diff --git a/slixmpp/plugins/xep_0060/__init__.py b/slixmpp/plugins/xep_0060/__init__.py
index 6bde51d3..dbfc1a94 100644
--- a/slixmpp/plugins/xep_0060/__init__.py
+++ b/slixmpp/plugins/xep_0060/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0060.pubsub import XEP_0060
diff --git a/slixmpp/plugins/xep_0060/pubsub.py b/slixmpp/plugins/xep_0060/pubsub.py
index cd069eed..7394834c 100644
--- a/slixmpp/plugins/xep_0060/pubsub.py
+++ b/slixmpp/plugins/xep_0060/pubsub.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.xmlstream import JID
diff --git a/slixmpp/plugins/xep_0060/stanza/__init__.py b/slixmpp/plugins/xep_0060/stanza/__init__.py
index 31c4ac68..d9a6fc2b 100644
--- a/slixmpp/plugins/xep_0060/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0060/stanza/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0060.stanza.pubsub import *
from slixmpp.plugins.xep_0060.stanza.pubsub_owner import *
from slixmpp.plugins.xep_0060.stanza.pubsub_event import *
diff --git a/slixmpp/plugins/xep_0060/stanza/base.py b/slixmpp/plugins/xep_0060/stanza/base.py
index 2f781e98..38966aae 100644
--- a/slixmpp/plugins/xep_0060/stanza/base.py
+++ b/slixmpp/plugins/xep_0060/stanza/base.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub.py b/slixmpp/plugins/xep_0060/stanza/pubsub.py
index 642d7963..cd13a6a4 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Iq, Message
from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from slixmpp.plugins import xep_0004
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py b/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py
index d0444081..72a4ba33 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_errors.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Error
from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub_event.py b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
index 81ed1917..c96a4124 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_event.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp import Message
diff --git a/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py b/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py
index 850df8cf..3bedc8cf 100644
--- a/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py
+++ b/slixmpp/plugins/xep_0060/stanza/pubsub_owner.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Iq
from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from slixmpp.plugins.xep_0004 import Form
diff --git a/slixmpp/plugins/xep_0066/__init__.py b/slixmpp/plugins/xep_0066/__init__.py
index b293de34..408b657f 100644
--- a/slixmpp/plugins/xep_0066/__init__.py
+++ b/slixmpp/plugins/xep_0066/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0066 import stanza
diff --git a/slixmpp/plugins/xep_0066/oob.py b/slixmpp/plugins/xep_0066/oob.py
index 7f32e39c..a20ea73b 100644
--- a/slixmpp/plugins/xep_0066/oob.py
+++ b/slixmpp/plugins/xep_0066/oob.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import Message, Presence, Iq
diff --git a/slixmpp/plugins/xep_0066/stanza.py b/slixmpp/plugins/xep_0066/stanza.py
index 55707b99..090f770c 100644
--- a/slixmpp/plugins/xep_0066/stanza.py
+++ b/slixmpp/plugins/xep_0066/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0070/__init__.py b/slixmpp/plugins/xep_0070/__init__.py
index 26a764d4..1210cb70 100644
--- a/slixmpp/plugins/xep_0070/__init__.py
+++ b/slixmpp/plugins/xep_0070/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0070.stanza import Confirm
diff --git a/slixmpp/plugins/xep_0070/confirm.py b/slixmpp/plugins/xep_0070/confirm.py
index 00b8dec0..334f78d4 100644
--- a/slixmpp/plugins/xep_0070/confirm.py
+++ b/slixmpp/plugins/xep_0070/confirm.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import logging
from uuid import uuid4
diff --git a/slixmpp/plugins/xep_0070/stanza.py b/slixmpp/plugins/xep_0070/stanza.py
index ada390d4..224616ed 100644
--- a/slixmpp/plugins/xep_0070/stanza.py
+++ b/slixmpp/plugins/xep_0070/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2015 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2015 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0071/__init__.py b/slixmpp/plugins/xep_0071/__init__.py
index 19275c7a..2a734075 100644
--- a/slixmpp/plugins/xep_0071/__init__.py
+++ b/slixmpp/plugins/xep_0071/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0071.stanza import XHTML_IM
diff --git a/slixmpp/plugins/xep_0071/stanza.py b/slixmpp/plugins/xep_0071/stanza.py
index 47951976..bd3236e8 100644
--- a/slixmpp/plugins/xep_0071/stanza.py
+++ b/slixmpp/plugins/xep_0071/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message
from slixmpp.util import unicode
from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin, tostring
diff --git a/slixmpp/plugins/xep_0071/xhtml_im.py b/slixmpp/plugins/xep_0071/xhtml_im.py
index ff4cf591..f9594942 100644
--- a/slixmpp/plugins/xep_0071/xhtml_im.py
+++ b/slixmpp/plugins/xep_0071/xhtml_im.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0077/__init__.py b/slixmpp/plugins/xep_0077/__init__.py
index 09a8a22e..8f6e14cb 100644
--- a/slixmpp/plugins/xep_0077/__init__.py
+++ b/slixmpp/plugins/xep_0077/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0077.stanza import Register, RegisterFeature
diff --git a/slixmpp/plugins/xep_0077/register.py b/slixmpp/plugins/xep_0077/register.py
index a7c6780f..a19f517f 100644
--- a/slixmpp/plugins/xep_0077/register.py
+++ b/slixmpp/plugins/xep_0077/register.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import ssl
diff --git a/slixmpp/plugins/xep_0077/stanza.py b/slixmpp/plugins/xep_0077/stanza.py
index d020a005..dfdbbd22 100644
--- a/slixmpp/plugins/xep_0077/stanza.py
+++ b/slixmpp/plugins/xep_0077/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from __future__ import unicode_literals
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0078/__init__.py b/slixmpp/plugins/xep_0078/__init__.py
index 45d4056c..7a66cf1f 100644
--- a/slixmpp/plugins/xep_0078/__init__.py
+++ b/slixmpp/plugins/xep_0078/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0078 import stanza
diff --git a/slixmpp/plugins/xep_0078/legacyauth.py b/slixmpp/plugins/xep_0078/legacyauth.py
index d949a913..b3876a60 100644
--- a/slixmpp/plugins/xep_0078/legacyauth.py
+++ b/slixmpp/plugins/xep_0078/legacyauth.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import uuid
import logging
import hashlib
diff --git a/slixmpp/plugins/xep_0078/stanza.py b/slixmpp/plugins/xep_0078/stanza.py
index 2a9ba510..2e152672 100644
--- a/slixmpp/plugins/xep_0078/stanza.py
+++ b/slixmpp/plugins/xep_0078/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0079/__init__.py b/slixmpp/plugins/xep_0079/__init__.py
index 864c9018..f36ce8c2 100644
--- a/slixmpp/plugins/xep_0079/__init__.py
+++ b/slixmpp/plugins/xep_0079/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0079.stanza import (
diff --git a/slixmpp/plugins/xep_0079/amp.py b/slixmpp/plugins/xep_0079/amp.py
index a8fbc258..d718f3c9 100644
--- a/slixmpp/plugins/xep_0079/amp.py
+++ b/slixmpp/plugins/xep_0079/amp.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import logging
from slixmpp.stanza import Message, Error, StreamFeatures
diff --git a/slixmpp/plugins/xep_0079/stanza.py b/slixmpp/plugins/xep_0079/stanza.py
index f959f21b..c4b49c7a 100644
--- a/slixmpp/plugins/xep_0079/stanza.py
+++ b/slixmpp/plugins/xep_0079/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from __future__ import unicode_literals
from slixmpp import JID
diff --git a/slixmpp/plugins/xep_0080/__init__.py b/slixmpp/plugins/xep_0080/__init__.py
index c487ef9c..a51ca9cb 100644
--- a/slixmpp/plugins/xep_0080/__init__.py
+++ b/slixmpp/plugins/xep_0080/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0080.stanza import Geoloc
diff --git a/slixmpp/plugins/xep_0080/geoloc.py b/slixmpp/plugins/xep_0080/geoloc.py
index e229bf5e..e5a2ea2e 100644
--- a/slixmpp/plugins/xep_0080/geoloc.py
+++ b/slixmpp/plugins/xep_0080/geoloc.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Erik Reuterborg Larsson
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0080/stanza.py b/slixmpp/plugins/xep_0080/stanza.py
index c63803bd..7546ad6d 100644
--- a/slixmpp/plugins/xep_0080/stanza.py
+++ b/slixmpp/plugins/xep_0080/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
from slixmpp.plugins import xep_0082
diff --git a/slixmpp/plugins/xep_0082.py b/slixmpp/plugins/xep_0082.py
index a0b22a2f..e8050286 100644
--- a/slixmpp/plugins/xep_0082.py
+++ b/slixmpp/plugins/xep_0082.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0084/__init__.py b/slixmpp/plugins/xep_0084/__init__.py
index aa5fdae5..b3ba5dbe 100644
--- a/slixmpp/plugins/xep_0084/__init__.py
+++ b/slixmpp/plugins/xep_0084/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0084 import stanza
diff --git a/slixmpp/plugins/xep_0084/stanza.py b/slixmpp/plugins/xep_0084/stanza.py
index 57754265..a2132c0b 100644
--- a/slixmpp/plugins/xep_0084/stanza.py
+++ b/slixmpp/plugins/xep_0084/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from base64 import b64encode, b64decode
from slixmpp.util import bytes
diff --git a/slixmpp/plugins/xep_0085/__init__.py b/slixmpp/plugins/xep_0085/__init__.py
index 5786c99d..7ca7dece 100644
--- a/slixmpp/plugins/xep_0085/__init__.py
+++ b/slixmpp/plugins/xep_0085/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0085.stanza import ChatState
diff --git a/slixmpp/plugins/xep_0085/chat_states.py b/slixmpp/plugins/xep_0085/chat_states.py
index ade6eda9..0567f2f7 100644
--- a/slixmpp/plugins/xep_0085/chat_states.py
+++ b/slixmpp/plugins/xep_0085/chat_states.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0085/stanza.py b/slixmpp/plugins/xep_0085/stanza.py
index d0937c06..481247a9 100644
--- a/slixmpp/plugins/xep_0085/stanza.py
+++ b/slixmpp/plugins/xep_0085/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import slixmpp
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0086/__init__.py b/slixmpp/plugins/xep_0086/__init__.py
index 1fbb642a..3398d6d8 100644
--- a/slixmpp/plugins/xep_0086/__init__.py
+++ b/slixmpp/plugins/xep_0086/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0086.stanza import LegacyError
diff --git a/slixmpp/plugins/xep_0086/legacy_error.py b/slixmpp/plugins/xep_0086/legacy_error.py
index e2ad41db..b9cb20dd 100644
--- a/slixmpp/plugins/xep_0086/legacy_error.py
+++ b/slixmpp/plugins/xep_0086/legacy_error.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Error
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0086/stanza.py b/slixmpp/plugins/xep_0086/stanza.py
index 6043308b..b457c8ba 100644
--- a/slixmpp/plugins/xep_0086/stanza.py
+++ b/slixmpp/plugins/xep_0086/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Error
from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0091/__init__.py b/slixmpp/plugins/xep_0091/__init__.py
index e5d166b1..1c9e62dd 100644
--- a/slixmpp/plugins/xep_0091/__init__.py
+++ b/slixmpp/plugins/xep_0091/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0091 import stanza
diff --git a/slixmpp/plugins/xep_0091/legacy_delay.py b/slixmpp/plugins/xep_0091/legacy_delay.py
index 6aef2ba1..36ef303e 100644
--- a/slixmpp/plugins/xep_0091/legacy_delay.py
+++ b/slixmpp/plugins/xep_0091/legacy_delay.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message, Presence
from slixmpp.xmlstream import register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0091/stanza.py b/slixmpp/plugins/xep_0091/stanza.py
index 0ce2acda..c165e0a2 100644
--- a/slixmpp/plugins/xep_0091/stanza.py
+++ b/slixmpp/plugins/xep_0091/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp.jid import JID
diff --git a/slixmpp/plugins/xep_0092/__init__.py b/slixmpp/plugins/xep_0092/__init__.py
index a970336a..0b71c4af 100644
--- a/slixmpp/plugins/xep_0092/__init__.py
+++ b/slixmpp/plugins/xep_0092/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0092 import stanza
diff --git a/slixmpp/plugins/xep_0092/stanza.py b/slixmpp/plugins/xep_0092/stanza.py
index f7dc9e69..b20034f3 100644
--- a/slixmpp/plugins/xep_0092/stanza.py
+++ b/slixmpp/plugins/xep_0092/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0092/version.py b/slixmpp/plugins/xep_0092/version.py
index 3a7b949f..f5ac8a33 100644
--- a/slixmpp/plugins/xep_0092/version.py
+++ b/slixmpp/plugins/xep_0092/version.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from asyncio import Future
diff --git a/slixmpp/plugins/xep_0095/__init__.py b/slixmpp/plugins/xep_0095/__init__.py
index 3c6380e1..a6f83cc6 100644
--- a/slixmpp/plugins/xep_0095/__init__.py
+++ b/slixmpp/plugins/xep_0095/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0095 import stanza
diff --git a/slixmpp/plugins/xep_0095/stanza.py b/slixmpp/plugins/xep_0095/stanza.py
index 0a99ddf6..ec705fd8 100644
--- a/slixmpp/plugins/xep_0095/stanza.py
+++ b/slixmpp/plugins/xep_0095/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0095/stream_initiation.py b/slixmpp/plugins/xep_0095/stream_initiation.py
index a7987d00..c7a86780 100644
--- a/slixmpp/plugins/xep_0095/stream_initiation.py
+++ b/slixmpp/plugins/xep_0095/stream_initiation.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import threading
diff --git a/slixmpp/plugins/xep_0096/__init__.py b/slixmpp/plugins/xep_0096/__init__.py
index 866a9820..bcb45153 100644
--- a/slixmpp/plugins/xep_0096/__init__.py
+++ b/slixmpp/plugins/xep_0096/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0096 import stanza
diff --git a/slixmpp/plugins/xep_0096/file_transfer.py b/slixmpp/plugins/xep_0096/file_transfer.py
index f136772d..7ac85f08 100644
--- a/slixmpp/plugins/xep_0096/file_transfer.py
+++ b/slixmpp/plugins/xep_0096/file_transfer.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq, Message
diff --git a/slixmpp/plugins/xep_0096/stanza.py b/slixmpp/plugins/xep_0096/stanza.py
index 2a1a9060..c2e8564c 100644
--- a/slixmpp/plugins/xep_0096/stanza.py
+++ b/slixmpp/plugins/xep_0096/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0106.py b/slixmpp/plugins/xep_0106.py
index bcf4c555..2321d864 100644
--- a/slixmpp/plugins/xep_0106.py
+++ b/slixmpp/plugins/xep_0106.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0107/__init__.py b/slixmpp/plugins/xep_0107/__init__.py
index 778fd33b..59c8a12a 100644
--- a/slixmpp/plugins/xep_0107/__init__.py
+++ b/slixmpp/plugins/xep_0107/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0107 import stanza
diff --git a/slixmpp/plugins/xep_0108/__init__.py b/slixmpp/plugins/xep_0108/__init__.py
index 54cc5ddd..c793e426 100644
--- a/slixmpp/plugins/xep_0108/__init__.py
+++ b/slixmpp/plugins/xep_0108/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0108 import stanza
diff --git a/slixmpp/plugins/xep_0115/__init__.py b/slixmpp/plugins/xep_0115/__init__.py
index 9a255f2b..c2849081 100644
--- a/slixmpp/plugins/xep_0115/__init__.py
+++ b/slixmpp/plugins/xep_0115/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0115.stanza import Capabilities
diff --git a/slixmpp/plugins/xep_0115/caps.py b/slixmpp/plugins/xep_0115/caps.py
index 0acfa83a..5f71165c 100644
--- a/slixmpp/plugins/xep_0115/caps.py
+++ b/slixmpp/plugins/xep_0115/caps.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import hashlib
import base64
diff --git a/slixmpp/plugins/xep_0115/stanza.py b/slixmpp/plugins/xep_0115/stanza.py
index 1811307f..90e4d0c4 100644
--- a/slixmpp/plugins/xep_0115/stanza.py
+++ b/slixmpp/plugins/xep_0115/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from __future__ import unicode_literals
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0115/static.py b/slixmpp/plugins/xep_0115/static.py
index 6c2e910b..2461d2e3 100644
--- a/slixmpp/plugins/xep_0115/static.py
+++ b/slixmpp/plugins/xep_0115/static.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.xmlstream import JID
diff --git a/slixmpp/plugins/xep_0118/__init__.py b/slixmpp/plugins/xep_0118/__init__.py
index 7ad48998..4ea20566 100644
--- a/slixmpp/plugins/xep_0118/__init__.py
+++ b/slixmpp/plugins/xep_0118/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0118 import stanza
diff --git a/slixmpp/plugins/xep_0128/__init__.py b/slixmpp/plugins/xep_0128/__init__.py
index cbabf09f..192956ae 100644
--- a/slixmpp/plugins/xep_0128/__init__.py
+++ b/slixmpp/plugins/xep_0128/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0128.static import StaticExtendedDisco
diff --git a/slixmpp/plugins/xep_0128/extended_disco.py b/slixmpp/plugins/xep_0128/extended_disco.py
index ae4f149a..d0264caf 100644
--- a/slixmpp/plugins/xep_0128/extended_disco.py
+++ b/slixmpp/plugins/xep_0128/extended_disco.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional
diff --git a/slixmpp/plugins/xep_0128/static.py b/slixmpp/plugins/xep_0128/static.py
index 27bcb056..11bd3b8b 100644
--- a/slixmpp/plugins/xep_0128/static.py
+++ b/slixmpp/plugins/xep_0128/static.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0131/__init__.py b/slixmpp/plugins/xep_0131/__init__.py
index 4151cc72..32ff186a 100644
--- a/slixmpp/plugins/xep_0131/__init__.py
+++ b/slixmpp/plugins/xep_0131/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0131 import stanza
diff --git a/slixmpp/plugins/xep_0131/headers.py b/slixmpp/plugins/xep_0131/headers.py
index 978c490d..f06713ce 100644
--- a/slixmpp/plugins/xep_0131/headers.py
+++ b/slixmpp/plugins/xep_0131/headers.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Message, Presence
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0131/stanza.py b/slixmpp/plugins/xep_0131/stanza.py
index 9f7bfa36..17827853 100644
--- a/slixmpp/plugins/xep_0131/stanza.py
+++ b/slixmpp/plugins/xep_0131/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET, ElementBase
diff --git a/slixmpp/plugins/xep_0133.py b/slixmpp/plugins/xep_0133.py
index aec1ee36..25f6b4bb 100644
--- a/slixmpp/plugins/xep_0133.py
+++ b/slixmpp/plugins/xep_0133.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0138.py b/slixmpp/plugins/xep_0138.py
index 4780f8ee..b7039f7b 100644
--- a/slixmpp/plugins/xep_0138.py
+++ b/slixmpp/plugins/xep_0138.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
import logging
import zlib
diff --git a/slixmpp/plugins/xep_0152/__init__.py b/slixmpp/plugins/xep_0152/__init__.py
index 4e6d3a09..8ac35bde 100644
--- a/slixmpp/plugins/xep_0152/__init__.py
+++ b/slixmpp/plugins/xep_0152/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0152 import stanza
diff --git a/slixmpp/plugins/xep_0152/reachability.py b/slixmpp/plugins/xep_0152/reachability.py
index 3c1a23aa..d80da45f 100644
--- a/slixmpp/plugins/xep_0152/reachability.py
+++ b/slixmpp/plugins/xep_0152/reachability.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from asyncio import Future
diff --git a/slixmpp/plugins/xep_0152/stanza.py b/slixmpp/plugins/xep_0152/stanza.py
index cbf725fa..e232c7a3 100644
--- a/slixmpp/plugins/xep_0152/stanza.py
+++ b/slixmpp/plugins/xep_0152/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0153/__init__.py b/slixmpp/plugins/xep_0153/__init__.py
index 378cec90..93dc2488 100644
--- a/slixmpp/plugins/xep_0153/__init__.py
+++ b/slixmpp/plugins/xep_0153/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0153.stanza import VCardTempUpdate
diff --git a/slixmpp/plugins/xep_0153/stanza.py b/slixmpp/plugins/xep_0153/stanza.py
index 9d0c51da..ebfb4e2b 100644
--- a/slixmpp/plugins/xep_0153/stanza.py
+++ b/slixmpp/plugins/xep_0153/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0153/vcard_avatar.py b/slixmpp/plugins/xep_0153/vcard_avatar.py
index ef328acc..56bf899a 100644
--- a/slixmpp/plugins/xep_0153/vcard_avatar.py
+++ b/slixmpp/plugins/xep_0153/vcard_avatar.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import hashlib
import logging
from asyncio import Future, ensure_future
diff --git a/slixmpp/plugins/xep_0163.py b/slixmpp/plugins/xep_0163.py
index 0b146bcb..b885eec8 100644
--- a/slixmpp/plugins/xep_0163.py
+++ b/slixmpp/plugins/xep_0163.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional, Callable
diff --git a/slixmpp/plugins/xep_0172/__init__.py b/slixmpp/plugins/xep_0172/__init__.py
index 6e8d25e0..da551912 100644
--- a/slixmpp/plugins/xep_0172/__init__.py
+++ b/slixmpp/plugins/xep_0172/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0172 import stanza
diff --git a/slixmpp/plugins/xep_0184/__init__.py b/slixmpp/plugins/xep_0184/__init__.py
index 21eebc37..4aed55e2 100644
--- a/slixmpp/plugins/xep_0184/__init__.py
+++ b/slixmpp/plugins/xep_0184/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0184.stanza import Request, Received
diff --git a/slixmpp/plugins/xep_0184/receipt.py b/slixmpp/plugins/xep_0184/receipt.py
index f89a5d9b..3a609e84 100644
--- a/slixmpp/plugins/xep_0184/receipt.py
+++ b/slixmpp/plugins/xep_0184/receipt.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import Message
diff --git a/slixmpp/plugins/xep_0184/stanza.py b/slixmpp/plugins/xep_0184/stanza.py
index 26e289a3..b73c751e 100644
--- a/slixmpp/plugins/xep_0184/stanza.py
+++ b/slixmpp/plugins/xep_0184/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Erik Reuterborg Larsson, Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.stanzabase import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0186/__init__.py b/slixmpp/plugins/xep_0186/__init__.py
index 0dc09337..bdb73d73 100644
--- a/slixmpp/plugins/xep_0186/__init__.py
+++ b/slixmpp/plugins/xep_0186/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0186 import stanza
diff --git a/slixmpp/plugins/xep_0186/invisible_command.py b/slixmpp/plugins/xep_0186/invisible_command.py
index a6df59a2..42bad25d 100644
--- a/slixmpp/plugins/xep_0186/invisible_command.py
+++ b/slixmpp/plugins/xep_0186/invisible_command.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0186/stanza.py b/slixmpp/plugins/xep_0186/stanza.py
index 1ae7e834..0d0fdac0 100644
--- a/slixmpp/plugins/xep_0186/stanza.py
+++ b/slixmpp/plugins/xep_0186/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0191/__init__.py b/slixmpp/plugins/xep_0191/__init__.py
index cd75684a..95379ab9 100644
--- a/slixmpp/plugins/xep_0191/__init__.py
+++ b/slixmpp/plugins/xep_0191/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0191.stanza import Block, Unblock, BlockList
diff --git a/slixmpp/plugins/xep_0191/blocking.py b/slixmpp/plugins/xep_0191/blocking.py
index 53c279df..6d7648fa 100644
--- a/slixmpp/plugins/xep_0191/blocking.py
+++ b/slixmpp/plugins/xep_0191/blocking.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from asyncio import Future
diff --git a/slixmpp/plugins/xep_0191/stanza.py b/slixmpp/plugins/xep_0191/stanza.py
index 0cf5c71a..c2f6728d 100644
--- a/slixmpp/plugins/xep_0191/stanza.py
+++ b/slixmpp/plugins/xep_0191/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET, ElementBase, JID
diff --git a/slixmpp/plugins/xep_0198/__init__.py b/slixmpp/plugins/xep_0198/__init__.py
index bd709041..7f2fbb3b 100644
--- a/slixmpp/plugins/xep_0198/__init__.py
+++ b/slixmpp/plugins/xep_0198/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0198.stanza import Enable, Enabled
diff --git a/slixmpp/plugins/xep_0198/stanza.py b/slixmpp/plugins/xep_0198/stanza.py
index 37560227..8470e0f5 100644
--- a/slixmpp/plugins/xep_0198/stanza.py
+++ b/slixmpp/plugins/xep_0198/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Error
from slixmpp.xmlstream import ElementBase, StanzaBase
diff --git a/slixmpp/plugins/xep_0198/stream_management.py b/slixmpp/plugins/xep_0198/stream_management.py
index 1344235a..3251fd6c 100644
--- a/slixmpp/plugins/xep_0198/stream_management.py
+++ b/slixmpp/plugins/xep_0198/stream_management.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import logging
import collections
diff --git a/slixmpp/plugins/xep_0199/__init__.py b/slixmpp/plugins/xep_0199/__init__.py
index 79163394..b2ddd403 100644
--- a/slixmpp/plugins/xep_0199/__init__.py
+++ b/slixmpp/plugins/xep_0199/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0199.stanza import Ping
diff --git a/slixmpp/plugins/xep_0199/ping.py b/slixmpp/plugins/xep_0199/ping.py
index 3221ba6a..89303ad9 100644
--- a/slixmpp/plugins/xep_0199/ping.py
+++ b/slixmpp/plugins/xep_0199/ping.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import time
import logging
diff --git a/slixmpp/plugins/xep_0199/stanza.py b/slixmpp/plugins/xep_0199/stanza.py
index 6795cb15..89a73de2 100644
--- a/slixmpp/plugins/xep_0199/stanza.py
+++ b/slixmpp/plugins/xep_0199/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import slixmpp
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0202/__init__.py b/slixmpp/plugins/xep_0202/__init__.py
index 7a28d6ec..e86b2dd5 100644
--- a/slixmpp/plugins/xep_0202/__init__.py
+++ b/slixmpp/plugins/xep_0202/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0202 import stanza
diff --git a/slixmpp/plugins/xep_0202/stanza.py b/slixmpp/plugins/xep_0202/stanza.py
index e71ffe9c..7d09de50 100644
--- a/slixmpp/plugins/xep_0202/stanza.py
+++ b/slixmpp/plugins/xep_0202/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import datetime as dt
diff --git a/slixmpp/plugins/xep_0202/time.py b/slixmpp/plugins/xep_0202/time.py
index bec3a771..cc92bbc6 100644
--- a/slixmpp/plugins/xep_0202/time.py
+++ b/slixmpp/plugins/xep_0202/time.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional
diff --git a/slixmpp/plugins/xep_0203/__init__.py b/slixmpp/plugins/xep_0203/__init__.py
index ec95f2b0..06313631 100644
--- a/slixmpp/plugins/xep_0203/__init__.py
+++ b/slixmpp/plugins/xep_0203/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0203 import stanza
diff --git a/slixmpp/plugins/xep_0203/delay.py b/slixmpp/plugins/xep_0203/delay.py
index 725003e2..93560443 100644
--- a/slixmpp/plugins/xep_0203/delay.py
+++ b/slixmpp/plugins/xep_0203/delay.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message, Presence
from slixmpp.xmlstream import register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0203/stanza.py b/slixmpp/plugins/xep_0203/stanza.py
index 5daed864..f173d41c 100644
--- a/slixmpp/plugins/xep_0203/stanza.py
+++ b/slixmpp/plugins/xep_0203/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp.jid import JID
diff --git a/slixmpp/plugins/xep_0221/__init__.py b/slixmpp/plugins/xep_0221/__init__.py
index b977acc7..520101ef 100644
--- a/slixmpp/plugins/xep_0221/__init__.py
+++ b/slixmpp/plugins/xep_0221/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0221 import stanza
diff --git a/slixmpp/plugins/xep_0221/media.py b/slixmpp/plugins/xep_0221/media.py
index 628a3b05..6d801b25 100644
--- a/slixmpp/plugins/xep_0221/media.py
+++ b/slixmpp/plugins/xep_0221/media.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0221/stanza.py b/slixmpp/plugins/xep_0221/stanza.py
index 097f03c4..d47d4230 100644
--- a/slixmpp/plugins/xep_0221/stanza.py
+++ b/slixmpp/plugins/xep_0221/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0222.py b/slixmpp/plugins/xep_0222.py
index fdcf6c70..6b612e14 100644
--- a/slixmpp/plugins/xep_0222.py
+++ b/slixmpp/plugins/xep_0222.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional, Callable, List
diff --git a/slixmpp/plugins/xep_0223.py b/slixmpp/plugins/xep_0223.py
index 6cb8e1f3..27437913 100644
--- a/slixmpp/plugins/xep_0223.py
+++ b/slixmpp/plugins/xep_0223.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional, Callable, List
diff --git a/slixmpp/plugins/xep_0224/__init__.py b/slixmpp/plugins/xep_0224/__init__.py
index 01a0c10a..7e72acce 100644
--- a/slixmpp/plugins/xep_0224/__init__.py
+++ b/slixmpp/plugins/xep_0224/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0224 import stanza
diff --git a/slixmpp/plugins/xep_0224/attention.py b/slixmpp/plugins/xep_0224/attention.py
index 196d3ed6..c77b91df 100644
--- a/slixmpp/plugins/xep_0224/attention.py
+++ b/slixmpp/plugins/xep_0224/attention.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.stanza import Message
diff --git a/slixmpp/plugins/xep_0224/stanza.py b/slixmpp/plugins/xep_0224/stanza.py
index d50d74b4..9577db54 100644
--- a/slixmpp/plugins/xep_0224/stanza.py
+++ b/slixmpp/plugins/xep_0224/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0231/__init__.py b/slixmpp/plugins/xep_0231/__init__.py
index 57d57846..4d2950c6 100644
--- a/slixmpp/plugins/xep_0231/__init__.py
+++ b/slixmpp/plugins/xep_0231/__init__.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz,
- Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz,
+# Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0231.stanza import BitsOfBinary
diff --git a/slixmpp/plugins/xep_0231/bob.py b/slixmpp/plugins/xep_0231/bob.py
index 690d34d4..b7e990b3 100644
--- a/slixmpp/plugins/xep_0231/bob.py
+++ b/slixmpp/plugins/xep_0231/bob.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz,
- Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz,
+# Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import hashlib
diff --git a/slixmpp/plugins/xep_0231/stanza.py b/slixmpp/plugins/xep_0231/stanza.py
index e7294c78..809253d4 100644
--- a/slixmpp/plugins/xep_0231/stanza.py
+++ b/slixmpp/plugins/xep_0231/stanza.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz
- Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz
+# Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import base64
diff --git a/slixmpp/plugins/xep_0235/__init__.py b/slixmpp/plugins/xep_0235/__init__.py
index 8810a84d..52563369 100644
--- a/slixmpp/plugins/xep_0235/__init__.py
+++ b/slixmpp/plugins/xep_0235/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0235 import stanza
diff --git a/slixmpp/plugins/xep_0235/oauth.py b/slixmpp/plugins/xep_0235/oauth.py
index 4d685cd2..1ebbb3ec 100644
--- a/slixmpp/plugins/xep_0235/oauth.py
+++ b/slixmpp/plugins/xep_0235/oauth.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
diff --git a/slixmpp/plugins/xep_0235/stanza.py b/slixmpp/plugins/xep_0235/stanza.py
index 5205b07c..3dec7b73 100644
--- a/slixmpp/plugins/xep_0235/stanza.py
+++ b/slixmpp/plugins/xep_0235/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import hmac
import hashlib
import urllib
diff --git a/slixmpp/plugins/xep_0242.py b/slixmpp/plugins/xep_0242.py
index 27e4e7c8..ed1620d7 100644
--- a/slixmpp/plugins/xep_0242.py
+++ b/slixmpp/plugins/xep_0242.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0249/__init__.py b/slixmpp/plugins/xep_0249/__init__.py
index 8f117851..d11ce635 100644
--- a/slixmpp/plugins/xep_0249/__init__.py
+++ b/slixmpp/plugins/xep_0249/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dalek
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0249.stanza import Invite
diff --git a/slixmpp/plugins/xep_0249/invite.py b/slixmpp/plugins/xep_0249/invite.py
index 4be6921f..7ba7cf4a 100644
--- a/slixmpp/plugins/xep_0249/invite.py
+++ b/slixmpp/plugins/xep_0249/invite.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dalek
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional
diff --git a/slixmpp/plugins/xep_0249/stanza.py b/slixmpp/plugins/xep_0249/stanza.py
index 8633c67e..ecc407c5 100644
--- a/slixmpp/plugins/xep_0249/stanza.py
+++ b/slixmpp/plugins/xep_0249/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2011 Nathanael C. Fritz, Dalek
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2011 Nathanael C. Fritz, Dalek
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0256.py b/slixmpp/plugins/xep_0256.py
index 4efa3518..24419d62 100644
--- a/slixmpp/plugins/xep_0256.py
+++ b/slixmpp/plugins/xep_0256.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Presence
diff --git a/slixmpp/plugins/xep_0256/__init__.py b/slixmpp/plugins/xep_0256/__init__.py
index ab1a80e0..831bd049 100644
--- a/slixmpp/plugins/xep_0256/__init__.py
+++ b/slixmpp/plugins/xep_0256/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0256.last_activity_presence import XEP_0256, LastActivity
diff --git a/slixmpp/plugins/xep_0256/last_activity_presence.py b/slixmpp/plugins/xep_0256/last_activity_presence.py
index eb153808..fc22dead 100644
--- a/slixmpp/plugins/xep_0256/last_activity_presence.py
+++ b/slixmpp/plugins/xep_0256/last_activity_presence.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Presence
diff --git a/slixmpp/plugins/xep_0257/__init__.py b/slixmpp/plugins/xep_0257/__init__.py
index 2621ad8f..9d9b46f2 100644
--- a/slixmpp/plugins/xep_0257/__init__.py
+++ b/slixmpp/plugins/xep_0257/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0257 import stanza
diff --git a/slixmpp/plugins/xep_0257/client_cert_management.py b/slixmpp/plugins/xep_0257/client_cert_management.py
index e5a06cf3..15d87f56 100644
--- a/slixmpp/plugins/xep_0257/client_cert_management.py
+++ b/slixmpp/plugins/xep_0257/client_cert_management.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0257/stanza.py b/slixmpp/plugins/xep_0257/stanza.py
index 18d26775..edb059b1 100644
--- a/slixmpp/plugins/xep_0257/stanza.py
+++ b/slixmpp/plugins/xep_0257/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET, register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0258/__init__.py b/slixmpp/plugins/xep_0258/__init__.py
index 7210072d..f66187de 100644
--- a/slixmpp/plugins/xep_0258/__init__.py
+++ b/slixmpp/plugins/xep_0258/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0258 import stanza
diff --git a/slixmpp/plugins/xep_0258/security_labels.py b/slixmpp/plugins/xep_0258/security_labels.py
index b4c3a75a..a74c6327 100644
--- a/slixmpp/plugins/xep_0258/security_labels.py
+++ b/slixmpp/plugins/xep_0258/security_labels.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq, Message
diff --git a/slixmpp/plugins/xep_0258/stanza.py b/slixmpp/plugins/xep_0258/stanza.py
index c0c7080c..7322db1c 100644
--- a/slixmpp/plugins/xep_0258/stanza.py
+++ b/slixmpp/plugins/xep_0258/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from base64 import b64encode, b64decode
from slixmpp import JID
diff --git a/slixmpp/plugins/xep_0270.py b/slixmpp/plugins/xep_0270.py
index e5316ae5..41efed77 100644
--- a/slixmpp/plugins/xep_0270.py
+++ b/slixmpp/plugins/xep_0270.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0279/__init__.py b/slixmpp/plugins/xep_0279/__init__.py
index 45fd3af0..fd02379a 100644
--- a/slixmpp/plugins/xep_0279/__init__.py
+++ b/slixmpp/plugins/xep_0279/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0279 import stanza
diff --git a/slixmpp/plugins/xep_0279/ipcheck.py b/slixmpp/plugins/xep_0279/ipcheck.py
index 8954c3d9..47f19ea8 100644
--- a/slixmpp/plugins/xep_0279/ipcheck.py
+++ b/slixmpp/plugins/xep_0279/ipcheck.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
diff --git a/slixmpp/plugins/xep_0279/stanza.py b/slixmpp/plugins/xep_0279/stanza.py
index d8f5f674..2f57f98c 100644
--- a/slixmpp/plugins/xep_0279/stanza.py
+++ b/slixmpp/plugins/xep_0279/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0280/__init__.py b/slixmpp/plugins/xep_0280/__init__.py
index ed9a19ef..c1e9f6ec 100644
--- a/slixmpp/plugins/xep_0280/__init__.py
+++ b/slixmpp/plugins/xep_0280/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0280.stanza import ReceivedCarbon, SentCarbon
diff --git a/slixmpp/plugins/xep_0280/carbons.py b/slixmpp/plugins/xep_0280/carbons.py
index aa71f7f1..6a35bf84 100644
--- a/slixmpp/plugins/xep_0280/carbons.py
+++ b/slixmpp/plugins/xep_0280/carbons.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0280/stanza.py b/slixmpp/plugins/xep_0280/stanza.py
index 343df12f..e17ea21f 100644
--- a/slixmpp/plugins/xep_0280/stanza.py
+++ b/slixmpp/plugins/xep_0280/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0297/__init__.py b/slixmpp/plugins/xep_0297/__init__.py
index 8d7adb63..bd84d70d 100644
--- a/slixmpp/plugins/xep_0297/__init__.py
+++ b/slixmpp/plugins/xep_0297/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0297 import stanza
diff --git a/slixmpp/plugins/xep_0297/forwarded.py b/slixmpp/plugins/xep_0297/forwarded.py
index a0c36d0c..88c3852c 100644
--- a/slixmpp/plugins/xep_0297/forwarded.py
+++ b/slixmpp/plugins/xep_0297/forwarded.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
diff --git a/slixmpp/plugins/xep_0297/stanza.py b/slixmpp/plugins/xep_0297/stanza.py
index d211f83c..715eb509 100644
--- a/slixmpp/plugins/xep_0297/stanza.py
+++ b/slixmpp/plugins/xep_0297/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message, Presence, Iq
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0300/__init__.py b/slixmpp/plugins/xep_0300/__init__.py
index 522d40e3..c6d7c424 100644
--- a/slixmpp/plugins/xep_0300/__init__.py
+++ b/slixmpp/plugins/xep_0300/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0300 import stanza
diff --git a/slixmpp/plugins/xep_0300/hash.py b/slixmpp/plugins/xep_0300/hash.py
index 75252d0c..e3f97f1b 100644
--- a/slixmpp/plugins/xep_0300/hash.py
+++ b/slixmpp/plugins/xep_0300/hash.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from base64 import b64encode
import hashlib
import logging
diff --git a/slixmpp/plugins/xep_0300/stanza.py b/slixmpp/plugins/xep_0300/stanza.py
index f5ab483c..d9c86d94 100644
--- a/slixmpp/plugins/xep_0300/stanza.py
+++ b/slixmpp/plugins/xep_0300/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0302.py b/slixmpp/plugins/xep_0302.py
index ff56e63e..fb802351 100644
--- a/slixmpp/plugins/xep_0302.py
+++ b/slixmpp/plugins/xep_0302.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin, register_plugin
diff --git a/slixmpp/plugins/xep_0308/__init__.py b/slixmpp/plugins/xep_0308/__init__.py
index 147cbd4b..39a2c17a 100644
--- a/slixmpp/plugins/xep_0308/__init__.py
+++ b/slixmpp/plugins/xep_0308/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0308.stanza import Replace
diff --git a/slixmpp/plugins/xep_0308/correction.py b/slixmpp/plugins/xep_0308/correction.py
index d94f62a4..69889ef7 100644
--- a/slixmpp/plugins/xep_0308/correction.py
+++ b/slixmpp/plugins/xep_0308/correction.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0308/stanza.py b/slixmpp/plugins/xep_0308/stanza.py
index 11e0d52b..d95b48be 100644
--- a/slixmpp/plugins/xep_0308/stanza.py
+++ b/slixmpp/plugins/xep_0308/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0313/__init__.py b/slixmpp/plugins/xep_0313/__init__.py
index 42d9025a..eace3dc7 100644
--- a/slixmpp/plugins/xep_0313/__init__.py
+++ b/slixmpp/plugins/xep_0313/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0313.stanza import Result, MAM, Preferences
diff --git a/slixmpp/plugins/xep_0313/mam.py b/slixmpp/plugins/xep_0313/mam.py
index da9ed17b..eaa598a6 100644
--- a/slixmpp/plugins/xep_0313/mam.py
+++ b/slixmpp/plugins/xep_0313/mam.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission
import logging
from datetime import datetime
diff --git a/slixmpp/plugins/xep_0313/stanza.py b/slixmpp/plugins/xep_0313/stanza.py
index 4e659b7b..4e43eeba 100644
--- a/slixmpp/plugins/xep_0313/stanza.py
+++ b/slixmpp/plugins/xep_0313/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import datetime as dt
from slixmpp.jid import JID
diff --git a/slixmpp/plugins/xep_0319/__init__.py b/slixmpp/plugins/xep_0319/__init__.py
index a9253b49..0deee768 100644
--- a/slixmpp/plugins/xep_0319/__init__.py
+++ b/slixmpp/plugins/xep_0319/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0319 import stanza
diff --git a/slixmpp/plugins/xep_0319/idle.py b/slixmpp/plugins/xep_0319/idle.py
index 9d77ed96..14dd7f4c 100644
--- a/slixmpp/plugins/xep_0319/idle.py
+++ b/slixmpp/plugins/xep_0319/idle.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from datetime import datetime, timedelta, timezone
from slixmpp.stanza import Presence
diff --git a/slixmpp/plugins/xep_0319/stanza.py b/slixmpp/plugins/xep_0319/stanza.py
index 3fdcd502..f1814b09 100644
--- a/slixmpp/plugins/xep_0319/stanza.py
+++ b/slixmpp/plugins/xep_0319/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime as dt
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0323/__init__.py b/slixmpp/plugins/xep_0323/__init__.py
index 6bf42fd6..edc34ba3 100644
--- a/slixmpp/plugins/xep_0323/__init__.py
+++ b/slixmpp/plugins/xep_0323/__init__.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0323.sensordata import XEP_0323
diff --git a/slixmpp/plugins/xep_0323/device.py b/slixmpp/plugins/xep_0323/device.py
index 994fc5ce..3f090380 100644
--- a/slixmpp/plugins/xep_0323/device.py
+++ b/slixmpp/plugins/xep_0323/device.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime
import logging
diff --git a/slixmpp/plugins/xep_0323/sensordata.py b/slixmpp/plugins/xep_0323/sensordata.py
index b16bd395..720f4966 100644
--- a/slixmpp/plugins/xep_0323/sensordata.py
+++ b/slixmpp/plugins/xep_0323/sensordata.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import time
import datetime
diff --git a/slixmpp/plugins/xep_0323/stanza/__init__.py b/slixmpp/plugins/xep_0323/stanza/__init__.py
index e1603e41..dc24a460 100644
--- a/slixmpp/plugins/xep_0323/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0323/stanza/__init__.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0323.stanza.sensordata import *
diff --git a/slixmpp/plugins/xep_0323/stanza/base.py b/slixmpp/plugins/xep_0323/stanza/base.py
index 7959b818..dabe893c 100644
--- a/slixmpp/plugins/xep_0323/stanza/base.py
+++ b/slixmpp/plugins/xep_0323/stanza/base.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET
pass
diff --git a/slixmpp/plugins/xep_0323/stanza/sensordata.py b/slixmpp/plugins/xep_0323/stanza/sensordata.py
index 7ab1e3ba..ff8feeec 100644
--- a/slixmpp/plugins/xep_0323/stanza/sensordata.py
+++ b/slixmpp/plugins/xep_0323/stanza/sensordata.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Iq, Message
from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
import re
diff --git a/slixmpp/plugins/xep_0323/timerreset.py b/slixmpp/plugins/xep_0323/timerreset.py
index 616380e7..4d51a4d0 100644
--- a/slixmpp/plugins/xep_0323/timerreset.py
+++ b/slixmpp/plugins/xep_0323/timerreset.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from threading import Thread, Event, Timer
import time
diff --git a/slixmpp/plugins/xep_0325/__init__.py b/slixmpp/plugins/xep_0325/__init__.py
index ce8cb7ce..9b0feb15 100644
--- a/slixmpp/plugins/xep_0325/__init__.py
+++ b/slixmpp/plugins/xep_0325/__init__.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0325.control import XEP_0325
diff --git a/slixmpp/plugins/xep_0325/control.py b/slixmpp/plugins/xep_0325/control.py
index 00f6dee4..734b3204 100644
--- a/slixmpp/plugins/xep_0325/control.py
+++ b/slixmpp/plugins/xep_0325/control.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import time
diff --git a/slixmpp/plugins/xep_0325/device.py b/slixmpp/plugins/xep_0325/device.py
index 05275088..cac09451 100644
--- a/slixmpp/plugins/xep_0325/device.py
+++ b/slixmpp/plugins/xep_0325/device.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import datetime
class Device(object):
diff --git a/slixmpp/plugins/xep_0325/stanza/__init__.py b/slixmpp/plugins/xep_0325/stanza/__init__.py
index 1466db5d..dd5edf66 100644
--- a/slixmpp/plugins/xep_0325/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0325/stanza/__init__.py
@@ -1,12 +1,9 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0325.stanza.control import *
diff --git a/slixmpp/plugins/xep_0325/stanza/base.py b/slixmpp/plugins/xep_0325/stanza/base.py
index 7959b818..dabe893c 100644
--- a/slixmpp/plugins/xep_0325/stanza/base.py
+++ b/slixmpp/plugins/xep_0325/stanza/base.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET
pass
diff --git a/slixmpp/plugins/xep_0325/stanza/control.py b/slixmpp/plugins/xep_0325/stanza/control.py
index 3662ff0c..d1835107 100644
--- a/slixmpp/plugins/xep_0325/stanza/control.py
+++ b/slixmpp/plugins/xep_0325/stanza/control.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of xeps for Internet of Things
- http://wiki.xmpp.org/web/Tech_pages/IoT_systems
- Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of xeps for Internet of Things
+# http://wiki.xmpp.org/web/Tech_pages/IoT_systems
+# Copyright (C) 2013 Sustainable Innovation, Joachim.lindborg@sust.se, bjorn.westrom@consoden.se
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Iq, Message
from slixmpp.xmlstream import register_stanza_plugin, ElementBase, ET, JID
from re import match
diff --git a/slixmpp/plugins/xep_0332/__init__.py b/slixmpp/plugins/xep_0332/__init__.py
index 8bf6b369..8f3aca75 100644
--- a/slixmpp/plugins/xep_0332/__init__.py
+++ b/slixmpp/plugins/xep_0332/__init__.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0332 import stanza
diff --git a/slixmpp/plugins/xep_0332/http.py b/slixmpp/plugins/xep_0332/http.py
index 50f14322..8df52d70 100644
--- a/slixmpp/plugins/xep_0332/http.py
+++ b/slixmpp/plugins/xep_0332/http.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Iq
diff --git a/slixmpp/plugins/xep_0332/stanza/__init__.py b/slixmpp/plugins/xep_0332/stanza/__init__.py
index f98375c6..5c25a73b 100644
--- a/slixmpp/plugins/xep_0332/stanza/__init__.py
+++ b/slixmpp/plugins/xep_0332/stanza/__init__.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.xep_0332.stanza.request import HTTPRequest
from slixmpp.plugins.xep_0332.stanza.response import HTTPResponse
from slixmpp.plugins.xep_0332.stanza.data import HTTPData
diff --git a/slixmpp/plugins/xep_0332/stanza/data.py b/slixmpp/plugins/xep_0332/stanza/data.py
index 92e3d3af..eaf9c3ed 100644
--- a/slixmpp/plugins/xep_0332/stanza/data.py
+++ b/slixmpp/plugins/xep_0332/stanza/data.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0332/stanza/request.py b/slixmpp/plugins/xep_0332/stanza/request.py
index 670e27b1..7be8f213 100644
--- a/slixmpp/plugins/xep_0332/stanza/request.py
+++ b/slixmpp/plugins/xep_0332/stanza/request.py
@@ -1,13 +1,10 @@
-"""
- slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0332/stanza/response.py b/slixmpp/plugins/xep_0332/stanza/response.py
index a25aa780..5e19951d 100644
--- a/slixmpp/plugins/xep_0332/stanza/response.py
+++ b/slixmpp/plugins/xep_0332/stanza/response.py
@@ -1,13 +1,10 @@
-"""
- Slixmpp: The Slick XMPP Library
- Implementation of HTTP over XMPP transport
- http://xmpp.org/extensions/xep-0332.html
- Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Implementation of HTTP over XMPP transport
+# http://xmpp.org/extensions/xep-0332.html
+# Copyright (C) 2015 Riptide IO, sangeeth@riptideio.com
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0333/__init__.py b/slixmpp/plugins/xep_0333/__init__.py
index a50dbe2b..822b8be1 100644
--- a/slixmpp/plugins/xep_0333/__init__.py
+++ b/slixmpp/plugins/xep_0333/__init__.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0333.stanza import Markable, Received, Displayed, Acknowledged
diff --git a/slixmpp/plugins/xep_0333/markers.py b/slixmpp/plugins/xep_0333/markers.py
index b8a003df..ca7a27da 100644
--- a/slixmpp/plugins/xep_0333/markers.py
+++ b/slixmpp/plugins/xep_0333/markers.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Optional
diff --git a/slixmpp/plugins/xep_0333/stanza.py b/slixmpp/plugins/xep_0333/stanza.py
index 77cd47a4..e32ca6f8 100644
--- a/slixmpp/plugins/xep_0333/stanza.py
+++ b/slixmpp/plugins/xep_0333/stanza.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
NS ='urn:xmpp:chat-markers:0'
diff --git a/slixmpp/plugins/xep_0334/__init__.py b/slixmpp/plugins/xep_0334/__init__.py
index 89dbcf7a..8273c5e4 100644
--- a/slixmpp/plugins/xep_0334/__init__.py
+++ b/slixmpp/plugins/xep_0334/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0334.stanza import Store, NoStore, NoPermanentStore, NoCopy
diff --git a/slixmpp/plugins/xep_0334/hints.py b/slixmpp/plugins/xep_0334/hints.py
index 5f86eecb..0f5f9f36 100644
--- a/slixmpp/plugins/xep_0334/hints.py
+++ b/slixmpp/plugins/xep_0334/hints.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import Message
diff --git a/slixmpp/plugins/xep_0335/__init__.py b/slixmpp/plugins/xep_0335/__init__.py
index b51296bd..ef506848 100644
--- a/slixmpp/plugins/xep_0335/__init__.py
+++ b/slixmpp/plugins/xep_0335/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Maxime “pep” Buquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Maxime “pep” Buquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0335 import stanza
diff --git a/slixmpp/plugins/xep_0335/json_containers.py b/slixmpp/plugins/xep_0335/json_containers.py
index 5c9f6245..f6cfafcc 100644
--- a/slixmpp/plugins/xep_0335/json_containers.py
+++ b/slixmpp/plugins/xep_0335/json_containers.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Maxime “pep” Buquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Maxime “pep” Buquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import Message
from slixmpp.plugins import BasePlugin
from slixmpp.xmlstream import register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0335/stanza.py b/slixmpp/plugins/xep_0335/stanza.py
index 6d5ca5b5..d6b70b0f 100644
--- a/slixmpp/plugins/xep_0335/stanza.py
+++ b/slixmpp/plugins/xep_0335/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Maxime “pep” Buquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Maxime “pep” Buquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import json
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0352/__init__.py b/slixmpp/plugins/xep_0352/__init__.py
index b648896c..771a28b7 100644
--- a/slixmpp/plugins/xep_0352/__init__.py
+++ b/slixmpp/plugins/xep_0352/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0352.stanza import Active, Inactive, ClientStateIndication
diff --git a/slixmpp/plugins/xep_0352/csi.py b/slixmpp/plugins/xep_0352/csi.py
index 21bfe371..d9f38348 100644
--- a/slixmpp/plugins/xep_0352/csi.py
+++ b/slixmpp/plugins/xep_0352/csi.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp import ClientXMPP
diff --git a/slixmpp/plugins/xep_0352/stanza.py b/slixmpp/plugins/xep_0352/stanza.py
index 20591b31..92f7a879 100644
--- a/slixmpp/plugins/xep_0352/stanza.py
+++ b/slixmpp/plugins/xep_0352/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Error
from slixmpp.xmlstream import ElementBase, StanzaBase
diff --git a/slixmpp/plugins/xep_0353/__init__.py b/slixmpp/plugins/xep_0353/__init__.py
index 89d86c51..b4944d52 100644
--- a/slixmpp/plugins/xep_0353/__init__.py
+++ b/slixmpp/plugins/xep_0353/__init__.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0353.stanza import Propose, Retract, Accept, Proceed, Reject
diff --git a/slixmpp/plugins/xep_0353/jingle_message.py b/slixmpp/plugins/xep_0353/jingle_message.py
index 07395241..5d69ff7e 100644
--- a/slixmpp/plugins/xep_0353/jingle_message.py
+++ b/slixmpp/plugins/xep_0353/jingle_message.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
import logging
from typing import Iterable, Tuple, Optional
diff --git a/slixmpp/plugins/xep_0353/stanza.py b/slixmpp/plugins/xep_0353/stanza.py
index 48046274..dd66381e 100644
--- a/slixmpp/plugins/xep_0353/stanza.py
+++ b/slixmpp/plugins/xep_0353/stanza.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from typing import Iterable, List, Tuple
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/plugins/xep_0359/__init__.py b/slixmpp/plugins/xep_0359/__init__.py
index dd01ea1e..669cd782 100644
--- a/slixmpp/plugins/xep_0359/__init__.py
+++ b/slixmpp/plugins/xep_0359/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0359.stanza import *
from slixmpp.plugins.xep_0359.stanzaid import XEP_0359
diff --git a/slixmpp/plugins/xep_0359/stanza.py b/slixmpp/plugins/xep_0359/stanza.py
index db8e9fff..019f3f98 100644
--- a/slixmpp/plugins/xep_0359/stanza.py
+++ b/slixmpp/plugins/xep_0359/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0359/stanzaid.py b/slixmpp/plugins/xep_0359/stanzaid.py
index 5783594c..c99a3360 100644
--- a/slixmpp/plugins/xep_0359/stanzaid.py
+++ b/slixmpp/plugins/xep_0359/stanzaid.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0359 import stanza
diff --git a/slixmpp/plugins/xep_0363/__init__.py b/slixmpp/plugins/xep_0363/__init__.py
index d40bee4e..0ed1d7c8 100644
--- a/slixmpp/plugins/xep_0363/__init__.py
+++ b/slixmpp/plugins/xep_0363/__init__.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0363.stanza import Request, Slot, Put, Get, Header
diff --git a/slixmpp/plugins/xep_0363/stanza.py b/slixmpp/plugins/xep_0363/stanza.py
index a57c5fb0..b9fc7fed 100644
--- a/slixmpp/plugins/xep_0363/stanza.py
+++ b/slixmpp/plugins/xep_0363/stanza.py
@@ -1,11 +1,8 @@
-"""
- slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Emmanuel Gil Peyrot
- This file is part of slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Emmanuel Gil Peyrot
+# This file is part of slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
class Request(ElementBase):
diff --git a/slixmpp/plugins/xep_0369/__init__.py b/slixmpp/plugins/xep_0369/__init__.py
index 2fa3a0ad..719ed2a3 100644
--- a/slixmpp/plugins/xep_0369/__init__.py
+++ b/slixmpp/plugins/xep_0369/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0369.stanza import *
from slixmpp.plugins.xep_0369.mix_core import XEP_0369
diff --git a/slixmpp/plugins/xep_0369/mix_core.py b/slixmpp/plugins/xep_0369/mix_core.py
index 688d4e6a..1ff3507c 100644
--- a/slixmpp/plugins/xep_0369/mix_core.py
+++ b/slixmpp/plugins/xep_0369/mix_core.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
Any,
Dict,
diff --git a/slixmpp/plugins/xep_0369/stanza.py b/slixmpp/plugins/xep_0369/stanza.py
index ca64b2c4..4b72e525 100644
--- a/slixmpp/plugins/xep_0369/stanza.py
+++ b/slixmpp/plugins/xep_0369/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
import xml.etree.ElementTree as ET
from slixmpp import JID
from slixmpp.stanza import (
diff --git a/slixmpp/plugins/xep_0377/__init__.py b/slixmpp/plugins/xep_0377/__init__.py
index 6ae7a097..6df3c568 100644
--- a/slixmpp/plugins/xep_0377/__init__.py
+++ b/slixmpp/plugins/xep_0377/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0377.stanza import Report, Text
diff --git a/slixmpp/plugins/xep_0377/spam_reporting.py b/slixmpp/plugins/xep_0377/spam_reporting.py
index e1ca0143..d6ef6d7e 100644
--- a/slixmpp/plugins/xep_0377/spam_reporting.py
+++ b/slixmpp/plugins/xep_0377/spam_reporting.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0377/stanza.py b/slixmpp/plugins/xep_0377/stanza.py
index ccc04c1f..40058c60 100644
--- a/slixmpp/plugins/xep_0377/stanza.py
+++ b/slixmpp/plugins/xep_0377/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ET, ElementBase
diff --git a/slixmpp/plugins/xep_0380/__init__.py b/slixmpp/plugins/xep_0380/__init__.py
index fec9f60f..e36e4962 100644
--- a/slixmpp/plugins/xep_0380/__init__.py
+++ b/slixmpp/plugins/xep_0380/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0380.stanza import Encryption
diff --git a/slixmpp/plugins/xep_0380/eme.py b/slixmpp/plugins/xep_0380/eme.py
index 65d585b3..f81552db 100644
--- a/slixmpp/plugins/xep_0380/eme.py
+++ b/slixmpp/plugins/xep_0380/eme.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
import slixmpp
diff --git a/slixmpp/plugins/xep_0380/stanza.py b/slixmpp/plugins/xep_0380/stanza.py
index 7dd678b1..7013c95f 100644
--- a/slixmpp/plugins/xep_0380/stanza.py
+++ b/slixmpp/plugins/xep_0380/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2016 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0382/__init__.py b/slixmpp/plugins/xep_0382/__init__.py
index 4a6b83fc..63b95897 100644
--- a/slixmpp/plugins/xep_0382/__init__.py
+++ b/slixmpp/plugins/xep_0382/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0382.stanza import *
from slixmpp.plugins.xep_0382.spoiler import XEP_0382
diff --git a/slixmpp/plugins/xep_0382/spoiler.py b/slixmpp/plugins/xep_0382/spoiler.py
index 2f556f77..92c4288c 100644
--- a/slixmpp/plugins/xep_0382/spoiler.py
+++ b/slixmpp/plugins/xep_0382/spoiler.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import JID
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0382 import stanza
diff --git a/slixmpp/plugins/xep_0382/stanza.py b/slixmpp/plugins/xep_0382/stanza.py
index 0ce2b5f4..4ae01fa5 100644
--- a/slixmpp/plugins/xep_0382/stanza.py
+++ b/slixmpp/plugins/xep_0382/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2021 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
register_stanza_plugin,
diff --git a/slixmpp/plugins/xep_0394/__init__.py b/slixmpp/plugins/xep_0394/__init__.py
index f3a9b635..f9216f29 100644
--- a/slixmpp/plugins/xep_0394/__init__.py
+++ b/slixmpp/plugins/xep_0394/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0394.stanza import Markup, Span, BlockCode, List, Li, BlockQuote
diff --git a/slixmpp/plugins/xep_0394/markup.py b/slixmpp/plugins/xep_0394/markup.py
index d3ec69e6..0ef27d74 100644
--- a/slixmpp/plugins/xep_0394/markup.py
+++ b/slixmpp/plugins/xep_0394/markup.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message
from slixmpp.plugins import BasePlugin
diff --git a/slixmpp/plugins/xep_0394/stanza.py b/slixmpp/plugins/xep_0394/stanza.py
index f15a9ba1..0f32daa3 100644
--- a/slixmpp/plugins/xep_0394/stanza.py
+++ b/slixmpp/plugins/xep_0394/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2017 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin, ET
diff --git a/slixmpp/plugins/xep_0403/__init__.py b/slixmpp/plugins/xep_0403/__init__.py
index 0526276e..08b12d79 100644
--- a/slixmpp/plugins/xep_0403/__init__.py
+++ b/slixmpp/plugins/xep_0403/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0403.stanza import *
from slixmpp.plugins.xep_0403.mix_presence import XEP_0403
diff --git a/slixmpp/plugins/xep_0403/mix_presence.py b/slixmpp/plugins/xep_0403/mix_presence.py
index 7b227da4..7d4c6cdf 100644
--- a/slixmpp/plugins/xep_0403/mix_presence.py
+++ b/slixmpp/plugins/xep_0403/mix_presence.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
Optional,
Set,
diff --git a/slixmpp/plugins/xep_0403/stanza.py b/slixmpp/plugins/xep_0403/stanza.py
index 3e5b9cde..b803c7a5 100644
--- a/slixmpp/plugins/xep_0403/stanza.py
+++ b/slixmpp/plugins/xep_0403/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from xml.etree import ElementTree as ET
from slixmpp import JID
from slixmpp.stanza import Presence
diff --git a/slixmpp/plugins/xep_0404/__init__.py b/slixmpp/plugins/xep_0404/__init__.py
index 21dd6814..1fc2a510 100644
--- a/slixmpp/plugins/xep_0404/__init__.py
+++ b/slixmpp/plugins/xep_0404/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0404.stanza import Participant
from slixmpp.plugins.xep_0404.mix_anon import XEP_0404
diff --git a/slixmpp/plugins/xep_0404/mix_anon.py b/slixmpp/plugins/xep_0404/mix_anon.py
index 35d5babd..1abd8c5c 100644
--- a/slixmpp/plugins/xep_0404/mix_anon.py
+++ b/slixmpp/plugins/xep_0404/mix_anon.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
Dict,
Optional,
diff --git a/slixmpp/plugins/xep_0404/stanza.py b/slixmpp/plugins/xep_0404/stanza.py
index 9bb9308e..538e1943 100644
--- a/slixmpp/plugins/xep_0404/stanza.py
+++ b/slixmpp/plugins/xep_0404/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.xmlstream import (
ElementBase,
register_stanza_plugin,
diff --git a/slixmpp/plugins/xep_0405/__init__.py b/slixmpp/plugins/xep_0405/__init__.py
index 0a877682..0cf7756b 100644
--- a/slixmpp/plugins/xep_0405/__init__.py
+++ b/slixmpp/plugins/xep_0405/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0405.stanza import *
from slixmpp.plugins.xep_0405.mix_pam import XEP_0405
diff --git a/slixmpp/plugins/xep_0405/mix_pam.py b/slixmpp/plugins/xep_0405/mix_pam.py
index 437ca792..2b132526 100644
--- a/slixmpp/plugins/xep_0405/mix_pam.py
+++ b/slixmpp/plugins/xep_0405/mix_pam.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
List,
Optional,
diff --git a/slixmpp/plugins/xep_0405/stanza.py b/slixmpp/plugins/xep_0405/stanza.py
index 58133d98..5e8dc38d 100644
--- a/slixmpp/plugins/xep_0405/stanza.py
+++ b/slixmpp/plugins/xep_0405/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp import JID
from slixmpp.stanza import Iq
from slixmpp.stanza.roster import Roster, RosterItem
diff --git a/slixmpp/plugins/xep_0421/__init__.py b/slixmpp/plugins/xep_0421/__init__.py
index 4595ffad..a8c9ffea 100644
--- a/slixmpp/plugins/xep_0421/__init__.py
+++ b/slixmpp/plugins/xep_0421/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0421.stanza import OccupantId
from slixmpp.plugins.xep_0421.occupant_id import XEP_0421
diff --git a/slixmpp/plugins/xep_0421/occupant_id.py b/slixmpp/plugins/xep_0421/occupant_id.py
index 4f5aac0a..b4506815 100644
--- a/slixmpp/plugins/xep_0421/occupant_id.py
+++ b/slixmpp/plugins/xep_0421/occupant_id.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp import JID, Message, Presence
from slixmpp.plugins import BasePlugin
from slixmpp.xmlstream import register_stanza_plugin
diff --git a/slixmpp/plugins/xep_0421/stanza.py b/slixmpp/plugins/xep_0421/stanza.py
index 510bb50d..d16e210e 100644
--- a/slixmpp/plugins/xep_0421/stanza.py
+++ b/slixmpp/plugins/xep_0421/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 "Maxime “pep” Buquet <pep@bouah.net>"
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase
diff --git a/slixmpp/plugins/xep_0422/__init__.py b/slixmpp/plugins/xep_0422/__init__.py
index 9a1575c1..5de372e7 100644
--- a/slixmpp/plugins/xep_0422/__init__.py
+++ b/slixmpp/plugins/xep_0422/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0422.stanza import *
from slixmpp.plugins.xep_0422.fastening import XEP_0422
diff --git a/slixmpp/plugins/xep_0422/fastening.py b/slixmpp/plugins/xep_0422/fastening.py
index d721dd20..99f05ad1 100644
--- a/slixmpp/plugins/xep_0422/fastening.py
+++ b/slixmpp/plugins/xep_0422/fastening.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0422 import stanza
diff --git a/slixmpp/plugins/xep_0422/stanza.py b/slixmpp/plugins/xep_0422/stanza.py
index a739809e..a8f197be 100644
--- a/slixmpp/plugins/xep_0422/stanza.py
+++ b/slixmpp/plugins/xep_0422/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0424/__init__.py b/slixmpp/plugins/xep_0424/__init__.py
index 0e5dfce1..57f87fc4 100644
--- a/slixmpp/plugins/xep_0424/__init__.py
+++ b/slixmpp/plugins/xep_0424/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0424.stanza import *
from slixmpp.plugins.xep_0424.retraction import XEP_0424
diff --git a/slixmpp/plugins/xep_0424/retraction.py b/slixmpp/plugins/xep_0424/retraction.py
index a8c12875..9931d69a 100644
--- a/slixmpp/plugins/xep_0424/retraction.py
+++ b/slixmpp/plugins/xep_0424/retraction.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Optional
from slixmpp import JID, Message
diff --git a/slixmpp/plugins/xep_0424/stanza.py b/slixmpp/plugins/xep_0424/stanza.py
index c55af08c..b225fadc 100644
--- a/slixmpp/plugins/xep_0424/stanza.py
+++ b/slixmpp/plugins/xep_0424/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0425/__init__.py b/slixmpp/plugins/xep_0425/__init__.py
index 2effe361..31a7971e 100644
--- a/slixmpp/plugins/xep_0425/__init__.py
+++ b/slixmpp/plugins/xep_0425/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0425.stanza import *
from slixmpp.plugins.xep_0425.moderation import XEP_0425
diff --git a/slixmpp/plugins/xep_0425/moderation.py b/slixmpp/plugins/xep_0425/moderation.py
index db5aee5d..053e18f6 100644
--- a/slixmpp/plugins/xep_0425/moderation.py
+++ b/slixmpp/plugins/xep_0425/moderation.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Optional
from slixmpp import JID, Message
diff --git a/slixmpp/plugins/xep_0425/stanza.py b/slixmpp/plugins/xep_0425/stanza.py
index 566b1d09..f195c99b 100644
--- a/slixmpp/plugins/xep_0425/stanza.py
+++ b/slixmpp/plugins/xep_0425/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message, Iq
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0428/__init__.py b/slixmpp/plugins/xep_0428/__init__.py
index 864f4ed3..8607e064 100644
--- a/slixmpp/plugins/xep_0428/__init__.py
+++ b/slixmpp/plugins/xep_0428/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0428.stanza import *
from slixmpp.plugins.xep_0428.fallback import XEP_0428
diff --git a/slixmpp/plugins/xep_0428/fallback.py b/slixmpp/plugins/xep_0428/fallback.py
index 83f6835f..d7c20bcc 100644
--- a/slixmpp/plugins/xep_0428/fallback.py
+++ b/slixmpp/plugins/xep_0428/fallback.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins import BasePlugin
from slixmpp.plugins.xep_0428 import stanza
diff --git a/slixmpp/plugins/xep_0428/stanza.py b/slixmpp/plugins/xep_0428/stanza.py
index 41df80d0..eb3c3dae 100644
--- a/slixmpp/plugins/xep_0428/stanza.py
+++ b/slixmpp/plugins/xep_0428/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0437/__init__.py b/slixmpp/plugins/xep_0437/__init__.py
index d84d18a1..16de1c81 100644
--- a/slixmpp/plugins/xep_0437/__init__.py
+++ b/slixmpp/plugins/xep_0437/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0437.rai import XEP_0437
diff --git a/slixmpp/plugins/xep_0437/rai.py b/slixmpp/plugins/xep_0437/rai.py
index c3c4d325..50a0c6b4 100644
--- a/slixmpp/plugins/xep_0437/rai.py
+++ b/slixmpp/plugins/xep_0437/rai.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Iterable, Optional
from slixmpp import JID
diff --git a/slixmpp/plugins/xep_0437/stanza.py b/slixmpp/plugins/xep_0437/stanza.py
index cd3a2c84..88067dc5 100644
--- a/slixmpp/plugins/xep_0437/stanza.py
+++ b/slixmpp/plugins/xep_0437/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Iterable
from slixmpp import JID, Presence
from slixmpp.xmlstream import (
diff --git a/slixmpp/plugins/xep_0439/__init__.py b/slixmpp/plugins/xep_0439/__init__.py
index 6fa46cb4..bf590fc1 100644
--- a/slixmpp/plugins/xep_0439/__init__.py
+++ b/slixmpp/plugins/xep_0439/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0439.stanza import *
from slixmpp.plugins.xep_0439.quickresponse import XEP_0439
diff --git a/slixmpp/plugins/xep_0439/quickresponse.py b/slixmpp/plugins/xep_0439/quickresponse.py
index 812a3d62..bc76ede3 100644
--- a/slixmpp/plugins/xep_0439/quickresponse.py
+++ b/slixmpp/plugins/xep_0439/quickresponse.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import (
Iterable,
Optional,
diff --git a/slixmpp/plugins/xep_0439/stanza.py b/slixmpp/plugins/xep_0439/stanza.py
index e00e1f27..70a2e14b 100644
--- a/slixmpp/plugins/xep_0439/stanza.py
+++ b/slixmpp/plugins/xep_0439/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permissio
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet <mathieui@mathieui.net>
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permissio
from slixmpp.stanza import Message
from slixmpp.xmlstream import (
ElementBase,
diff --git a/slixmpp/plugins/xep_0444/__init__.py b/slixmpp/plugins/xep_0444/__init__.py
index dff4287c..fcf6564e 100644
--- a/slixmpp/plugins/xep_0444/__init__.py
+++ b/slixmpp/plugins/xep_0444/__init__.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.plugins.base import register_plugin
from slixmpp.plugins.xep_0444.reactions import XEP_0444
diff --git a/slixmpp/plugins/xep_0444/reactions.py b/slixmpp/plugins/xep_0444/reactions.py
index 37ab7d55..1d0ecd5d 100644
--- a/slixmpp/plugins/xep_0444/reactions.py
+++ b/slixmpp/plugins/xep_0444/reactions.py
@@ -1,10 +1,7 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Iterable
from slixmpp import JID
diff --git a/slixmpp/plugins/xep_0444/stanza.py b/slixmpp/plugins/xep_0444/stanza.py
index 4d652116..02684df1 100644
--- a/slixmpp/plugins/xep_0444/stanza.py
+++ b/slixmpp/plugins/xep_0444/stanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from typing import Set, Iterable
from slixmpp.xmlstream import ElementBase
try:
diff --git a/slixmpp/roster/__init__.py b/slixmpp/roster/__init__.py
index 9a9b69a1..6018585b 100644
--- a/slixmpp/roster/__init__.py
+++ b/slixmpp/roster/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.roster.item import RosterItem
from slixmpp.roster.single import RosterNode
from slixmpp.roster.multi import Roster
diff --git a/slixmpp/roster/item.py b/slixmpp/roster/item.py
index c1eb574a..daa1e2b4 100644
--- a/slixmpp/roster/item.py
+++ b/slixmpp/roster/item.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
class RosterItem(object):
diff --git a/slixmpp/roster/multi.py b/slixmpp/roster/multi.py
index e1a44a08..083e7dbc 100644
--- a/slixmpp/roster/multi.py
+++ b/slixmpp/roster/multi.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Presence
from slixmpp.xmlstream import JID
from slixmpp.roster import RosterNode
diff --git a/slixmpp/roster/single.py b/slixmpp/roster/single.py
index 3961cddf..c06a50bb 100644
--- a/slixmpp/roster/single.py
+++ b/slixmpp/roster/single.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import threading
from slixmpp.xmlstream import JID
diff --git a/slixmpp/stanza/__init__.py b/slixmpp/stanza/__init__.py
index 6cd6a2c5..6e2e9718 100644
--- a/slixmpp/stanza/__init__.py
+++ b/slixmpp/stanza/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza.error import Error
from slixmpp.stanza.iq import Iq
diff --git a/slixmpp/stanza/atom.py b/slixmpp/stanza/atom.py
index 8dde00de..e02e9337 100644
--- a/slixmpp/stanza/atom.py
+++ b/slixmpp/stanza/atom.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, register_stanza_plugin
class AtomEntry(ElementBase):
diff --git a/slixmpp/stanza/error.py b/slixmpp/stanza/error.py
index 132ffc4d..54ace5a8 100644
--- a/slixmpp/stanza/error.py
+++ b/slixmpp/stanza/error.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import ElementBase, ET
diff --git a/slixmpp/stanza/htmlim.py b/slixmpp/stanza/htmlim.py
index a5a3e5f3..4ebb94eb 100644
--- a/slixmpp/stanza/htmlim.py
+++ b/slixmpp/stanza/htmlim.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Message
from slixmpp.xmlstream import register_stanza_plugin
from slixmpp.plugins.xep_0071 import XHTML_IM as HTMLIM
diff --git a/slixmpp/stanza/iq.py b/slixmpp/stanza/iq.py
index 0f53425b..0242308e 100644
--- a/slixmpp/stanza/iq.py
+++ b/slixmpp/stanza/iq.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza.rootstanza import RootStanza
from slixmpp.xmlstream import StanzaBase, ET
from slixmpp.xmlstream.handler import Waiter, Callback, CoroutineCallback
diff --git a/slixmpp/stanza/message.py b/slixmpp/stanza/message.py
index 716d48e0..5a3432a6 100644
--- a/slixmpp/stanza/message.py
+++ b/slixmpp/stanza/message.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza.rootstanza import RootStanza
from slixmpp.xmlstream import StanzaBase, ET
diff --git a/slixmpp/stanza/presence.py b/slixmpp/stanza/presence.py
index 7e59e1c5..297fcfea 100644
--- a/slixmpp/stanza/presence.py
+++ b/slixmpp/stanza/presence.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza.rootstanza import RootStanza
from slixmpp.xmlstream import StanzaBase
diff --git a/slixmpp/stanza/rootstanza.py b/slixmpp/stanza/rootstanza.py
index a6dd958e..351596ff 100644
--- a/slixmpp/stanza/rootstanza.py
+++ b/slixmpp/stanza/rootstanza.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from slixmpp.exceptions import XMPPError, IqError, IqTimeout
diff --git a/slixmpp/stanza/roster.py b/slixmpp/stanza/roster.py
index b028e432..92d84491 100644
--- a/slixmpp/stanza/roster.py
+++ b/slixmpp/stanza/roster.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza import Iq
from slixmpp.xmlstream import JID
from slixmpp.xmlstream import ET, ElementBase, register_stanza_plugin
diff --git a/slixmpp/stanza/stream_error.py b/slixmpp/stanza/stream_error.py
index 2aa70173..0e728c8e 100644
--- a/slixmpp/stanza/stream_error.py
+++ b/slixmpp/stanza/stream_error.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.stanza.error import Error
from slixmpp.xmlstream import StanzaBase
diff --git a/slixmpp/stanza/stream_features.py b/slixmpp/stanza/stream_features.py
index 027747a1..7362f17b 100644
--- a/slixmpp/stanza/stream_features.py
+++ b/slixmpp/stanza/stream_features.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream import StanzaBase
diff --git a/slixmpp/stringprep.py b/slixmpp/stringprep.py
index 672c63b7..2ac24a4a 100644
--- a/slixmpp/stringprep.py
+++ b/slixmpp/stringprep.py
@@ -1,16 +1,10 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.stringprep
- ~~~~~~~~~~~~~~~~~~~~~~~
-
- This module is a fallback using python’s stringprep instead of libidn’s.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2015 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.stringprep
+# ~~~~~~~~~~~~~~~~~~~~~~~
+# This module is a fallback using python’s stringprep instead of libidn’s.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2015 Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
+# :license: MIT, see LICENSE for more details
import logging
import stringprep
from slixmpp.util import stringprep_profiles
diff --git a/slixmpp/test/__init__.py b/slixmpp/test/__init__.py
index 0244afe3..d73f2ebe 100644
--- a/slixmpp/test/__init__.py
+++ b/slixmpp/test/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.test.mocksocket import TestSocket, TestTransport
from slixmpp.test.livesocket import TestLiveSocket
from slixmpp.test.slixtest import *
diff --git a/slixmpp/test/integration.py b/slixmpp/test/integration.py
index 7da3f86a..e8093107 100644
--- a/slixmpp/test/integration.py
+++ b/slixmpp/test/integration.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2020 Mathieu Pasquet
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2020 Mathieu Pasquet
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import asyncio
import os
try:
diff --git a/slixmpp/test/livesocket.py b/slixmpp/test/livesocket.py
index e7deb617..92669a39 100644
--- a/slixmpp/test/livesocket.py
+++ b/slixmpp/test/livesocket.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import socket
import threading
from queue import Queue
diff --git a/slixmpp/test/mocksocket.py b/slixmpp/test/mocksocket.py
index 149df29c..c553fcd3 100644
--- a/slixmpp/test/mocksocket.py
+++ b/slixmpp/test/mocksocket.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import socket
from queue import Queue
diff --git a/slixmpp/test/slixtest.py b/slixmpp/test/slixtest.py
index fbeff3c7..6ae2cc8f 100644
--- a/slixmpp/test/slixtest.py
+++ b/slixmpp/test/slixtest.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz, Lance J.T. Stout
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import unittest
from queue import Queue
from xml.parsers.expat import ExpatError
diff --git a/slixmpp/util/__init__.py b/slixmpp/util/__init__.py
index ecf118d7..67191d0c 100644
--- a/slixmpp/util/__init__.py
+++ b/slixmpp/util/__init__.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.util
- ~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.util
+# ~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
from slixmpp.util.misc_ops import bytes, unicode, hashes, hash, \
num_to_bytes, bytes_to_num, quote, \
diff --git a/slixmpp/util/cache.py b/slixmpp/util/cache.py
index 09495841..23592404 100644
--- a/slixmpp/util/cache.py
+++ b/slixmpp/util/cache.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2018 Emmanuel Gil Peyrot
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2018 Emmanuel Gil Peyrot
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import os
import logging
diff --git a/slixmpp/util/sasl/__init__.py b/slixmpp/util/sasl/__init__.py
index 0e7e7fbd..deddb439 100644
--- a/slixmpp/util/sasl/__init__.py
+++ b/slixmpp/util/sasl/__init__.py
@@ -1,17 +1,10 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.util.sasl
- ~~~~~~~~~~~~~~~~~~~
-
- This module was originally based on Dave Cridland's Suelta library.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copryight: (c) 2004-2013 David Alan Cridland
- :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
-
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.util.sasl
+# ~~~~~~~~~~~~~~~~~~~
+# This module was originally based on Dave Cridland's Suelta library.
+# Part of Slixmpp: The Slick XMPP Library
+# :copryight: (c) 2004-2013 David Alan Cridland
+# :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
from slixmpp.util.sasl.client import *
from slixmpp.util.sasl.mechanisms import *
diff --git a/slixmpp/util/sasl/client.py b/slixmpp/util/sasl/client.py
index 745eca20..7c9d38e0 100644
--- a/slixmpp/util/sasl/client.py
+++ b/slixmpp/util/sasl/client.py
@@ -1,18 +1,11 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.util.sasl.client
- ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- This module was originally based on Dave Cridland's Suelta library.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copryight: (c) 2004-2013 David Alan Cridland
- :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
-
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.util.sasl.client
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# This module was originally based on Dave Cridland's Suelta library.
+# Part of Slixmpp: The Slick XMPP Library
+# :copryight: (c) 2004-2013 David Alan Cridland
+# :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
import logging
import stringprep
diff --git a/slixmpp/util/sasl/mechanisms.py b/slixmpp/util/sasl/mechanisms.py
index 874787a9..53f39395 100644
--- a/slixmpp/util/sasl/mechanisms.py
+++ b/slixmpp/util/sasl/mechanisms.py
@@ -1,20 +1,12 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.util.sasl.mechanisms
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- A collection of supported SASL mechanisms.
-
- This module was originally based on Dave Cridland's Suelta library.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copryight: (c) 2004-2013 David Alan Cridland
- :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
-
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.util.sasl.mechanisms
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# A collection of supported SASL mechanisms.
+# This module was originally based on Dave Cridland's Suelta library.
+# Part of Slixmpp: The Slick XMPP Library
+# :copryight: (c) 2004-2013 David Alan Cridland
+# :copyright: (c) 2013 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
import hmac
import random
diff --git a/slixmpp/util/stringprep_profiles.py b/slixmpp/util/stringprep_profiles.py
index 8ba3842f..d8dda890 100644
--- a/slixmpp/util/stringprep_profiles.py
+++ b/slixmpp/util/stringprep_profiles.py
@@ -1,18 +1,12 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.util.stringprep_profiles
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- This module makes it easier to define profiles of stringprep,
- such as nodeprep and resourceprep for JID validation, and
- SASLprep for SASL.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.util.stringprep_profiles
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# This module makes it easier to define profiles of stringprep,
+# such as nodeprep and resourceprep for JID validation, and
+# SASLprep for SASL.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
from __future__ import unicode_literals
diff --git a/slixmpp/version.py b/slixmpp/version.py
index 4d8f4819..7cff2e74 100644
--- a/slixmpp/version.py
+++ b/slixmpp/version.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
# We don't want to have to import the entire library
# just to get the version info for setup.py
diff --git a/slixmpp/xmlstream/__init__.py b/slixmpp/xmlstream/__init__.py
index b5302292..6c27c0cb 100644
--- a/slixmpp/xmlstream/__init__.py
+++ b/slixmpp/xmlstream/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.jid import JID
from slixmpp.xmlstream.stanzabase import StanzaBase, ElementBase, ET
from slixmpp.xmlstream.stanzabase import register_stanza_plugin
diff --git a/slixmpp/xmlstream/handler/__init__.py b/slixmpp/xmlstream/handler/__init__.py
index 51a7ca6a..5fbfc0f8 100644
--- a/slixmpp/xmlstream/handler/__init__.py
+++ b/slixmpp/xmlstream/handler/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.handler.callback import Callback
from slixmpp.xmlstream.handler.coroutine_callback import CoroutineCallback
from slixmpp.xmlstream.handler.collector import Collector
diff --git a/slixmpp/xmlstream/handler/base.py b/slixmpp/xmlstream/handler/base.py
index b6bff096..1e657777 100644
--- a/slixmpp/xmlstream/handler/base.py
+++ b/slixmpp/xmlstream/handler/base.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.handler.base
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.handler.base
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import weakref
diff --git a/slixmpp/xmlstream/handler/callback.py b/slixmpp/xmlstream/handler/callback.py
index 4cb329af..93cec6b7 100644
--- a/slixmpp/xmlstream/handler/callback.py
+++ b/slixmpp/xmlstream/handler/callback.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.handler.callback
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.handler.callback
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.handler.base import BaseHandler
diff --git a/slixmpp/xmlstream/handler/collector.py b/slixmpp/xmlstream/handler/collector.py
index d9e20279..8d012873 100644
--- a/slixmpp/xmlstream/handler/collector.py
+++ b/slixmpp/xmlstream/handler/collector.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.handler.collector
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.handler.collector
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2012 Nathanael C. Fritz, Lance J.T. Stout
+# :license: MIT, see LICENSE for more details
import logging
from queue import Queue, Empty
diff --git a/slixmpp/xmlstream/handler/coroutine_callback.py b/slixmpp/xmlstream/handler/coroutine_callback.py
index 0708a6e4..6568ba9f 100644
--- a/slixmpp/xmlstream/handler/coroutine_callback.py
+++ b/slixmpp/xmlstream/handler/coroutine_callback.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.handler.callback
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.handler.callback
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.handler.base import BaseHandler
from slixmpp.xmlstream.asyncio import asyncio
diff --git a/slixmpp/xmlstream/handler/waiter.py b/slixmpp/xmlstream/handler/waiter.py
index b82fa5ca..758cd1f1 100644
--- a/slixmpp/xmlstream/handler/waiter.py
+++ b/slixmpp/xmlstream/handler/waiter.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.handler.waiter
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.handler.waiter
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
import logging
import asyncio
from asyncio import Queue, wait_for, TimeoutError
diff --git a/slixmpp/xmlstream/handler/xmlcallback.py b/slixmpp/xmlstream/handler/xmlcallback.py
index 60ccbaed..b44b2da1 100644
--- a/slixmpp/xmlstream/handler/xmlcallback.py
+++ b/slixmpp/xmlstream/handler/xmlcallback.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.handler import Callback
diff --git a/slixmpp/xmlstream/handler/xmlwaiter.py b/slixmpp/xmlstream/handler/xmlwaiter.py
index dc014da0..6eb6577e 100644
--- a/slixmpp/xmlstream/handler/xmlwaiter.py
+++ b/slixmpp/xmlstream/handler/xmlwaiter.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.handler import Waiter
diff --git a/slixmpp/xmlstream/matcher/__init__.py b/slixmpp/xmlstream/matcher/__init__.py
index 47487d4a..64af8270 100644
--- a/slixmpp/xmlstream/matcher/__init__.py
+++ b/slixmpp/xmlstream/matcher/__init__.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.matcher.id import MatcherId
from slixmpp.xmlstream.matcher.idsender import MatchIDSender
from slixmpp.xmlstream.matcher.many import MatchMany
diff --git a/slixmpp/xmlstream/matcher/base.py b/slixmpp/xmlstream/matcher/base.py
index 4f15c63d..e2560d2b 100644
--- a/slixmpp/xmlstream/matcher/base.py
+++ b/slixmpp/xmlstream/matcher/base.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.matcher.base
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.matcher.base
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
class MatcherBase(object):
diff --git a/slixmpp/xmlstream/matcher/id.py b/slixmpp/xmlstream/matcher/id.py
index ddef75dc..44df2c18 100644
--- a/slixmpp/xmlstream/matcher/id.py
+++ b/slixmpp/xmlstream/matcher/id.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.matcher.id
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.matcher.id
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.matcher.base import MatcherBase
diff --git a/slixmpp/xmlstream/matcher/idsender.py b/slixmpp/xmlstream/matcher/idsender.py
index 79f73911..8f5d0303 100644
--- a/slixmpp/xmlstream/matcher/idsender.py
+++ b/slixmpp/xmlstream/matcher/idsender.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.matcher.id
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.matcher.id
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.matcher.base import MatcherBase
diff --git a/slixmpp/xmlstream/matcher/many.py b/slixmpp/xmlstream/matcher/many.py
index ef6a64d3..e8ad54e7 100644
--- a/slixmpp/xmlstream/matcher/many.py
+++ b/slixmpp/xmlstream/matcher/many.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
from slixmpp.xmlstream.matcher.base import MatcherBase
diff --git a/slixmpp/xmlstream/matcher/stanzapath.py b/slixmpp/xmlstream/matcher/stanzapath.py
index c9f245e1..1bf3fa8e 100644
--- a/slixmpp/xmlstream/matcher/stanzapath.py
+++ b/slixmpp/xmlstream/matcher/stanzapath.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.matcher.stanzapath
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.matcher.stanzapath
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.matcher.base import MatcherBase
from slixmpp.xmlstream.stanzabase import fix_ns
diff --git a/slixmpp/xmlstream/matcher/xmlmask.py b/slixmpp/xmlstream/matcher/xmlmask.py
index 343bb340..d50b706e 100644
--- a/slixmpp/xmlstream/matcher/xmlmask.py
+++ b/slixmpp/xmlstream/matcher/xmlmask.py
@@ -1,11 +1,8 @@
-"""
- Slixmpp: The Slick XMPP Library
- Copyright (C) 2010 Nathanael C. Fritz
- This file is part of Slixmpp.
-
- See the file LICENSE for copying permission.
-"""
+# Slixmpp: The Slick XMPP Library
+# Copyright (C) 2010 Nathanael C. Fritz
+# This file is part of Slixmpp.
+# See the file LICENSE for copying permission.
import logging
from xml.parsers.expat import ExpatError
diff --git a/slixmpp/xmlstream/matcher/xpath.py b/slixmpp/xmlstream/matcher/xpath.py
index 0edef5a9..b7503b73 100644
--- a/slixmpp/xmlstream/matcher/xpath.py
+++ b/slixmpp/xmlstream/matcher/xpath.py
@@ -1,14 +1,9 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.matcher.xpath
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.matcher.xpath
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.stanzabase import ET, fix_ns
from slixmpp.xmlstream.matcher.base import MatcherBase
diff --git a/slixmpp/xmlstream/resolver.py b/slixmpp/xmlstream/resolver.py
index 379c53ac..97798353 100644
--- a/slixmpp/xmlstream/resolver.py
+++ b/slixmpp/xmlstream/resolver.py
@@ -1,12 +1,8 @@
-# -*- encoding: utf-8 -*-
-"""
- slixmpp.xmlstream.dns
- ~~~~~~~~~~~~~~~~~~~~~~~
-
- :copyright: (c) 2012 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.dns
+# ~~~~~~~~~~~~~~~~~~~~~~~
+# :copyright: (c) 2012 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from slixmpp.xmlstream.asyncio import asyncio
import socket
diff --git a/slixmpp/xmlstream/stanzabase.py b/slixmpp/xmlstream/stanzabase.py
index da9c7e06..0fa5ef27 100644
--- a/slixmpp/xmlstream/stanzabase.py
+++ b/slixmpp/xmlstream/stanzabase.py
@@ -1,17 +1,11 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.stanzabase
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- module implements a wrapper layer for XML objects
- that allows them to be treated like dictionaries.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.stanzabase
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# module implements a wrapper layer for XML objects
+# that allows them to be treated like dictionaries.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from __future__ import annotations
import copy
diff --git a/slixmpp/xmlstream/tostring.py b/slixmpp/xmlstream/tostring.py
index f772ff63..efac124e 100644
--- a/slixmpp/xmlstream/tostring.py
+++ b/slixmpp/xmlstream/tostring.py
@@ -1,18 +1,12 @@
-# -*- coding: utf-8 -*-
-"""
- slixmpp.xmlstream.tostring
- ~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- This module converts XML objects into Unicode strings and
- intelligently includes namespaces only when necessary to
- keep the output readable.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.tostring
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~
+# This module converts XML objects into Unicode strings and
+# intelligently includes namespaces only when necessary to
+# keep the output readable.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
XML_NS = 'http://www.w3.org/XML/1998/namespace'
diff --git a/slixmpp/xmlstream/xmlstream.py b/slixmpp/xmlstream/xmlstream.py
index e6af3faa..de3ea8cf 100644
--- a/slixmpp/xmlstream/xmlstream.py
+++ b/slixmpp/xmlstream/xmlstream.py
@@ -1,17 +1,12 @@
-"""
- slixmpp.xmlstream.xmlstream
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- This module provides the module for creating and
- interacting with generic XML streams, along with
- the necessary eventing infrastructure.
-
- Part of Slixmpp: The Slick XMPP Library
-
- :copyright: (c) 2011 Nathanael C. Fritz
- :license: MIT, see LICENSE for more details
-"""
+# slixmpp.xmlstream.xmlstream
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# This module provides the module for creating and
+# interacting with generic XML streams, along with
+# the necessary eventing infrastructure.
+# Part of Slixmpp: The Slick XMPP Library
+# :copyright: (c) 2011 Nathanael C. Fritz
+# :license: MIT, see LICENSE for more details
from typing import (
Any,
Callable,