global: rewrite copyright notice to use comments

6 files changed, 39 insertions, 75 deletions

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