6 files changed, 36 insertions, 54 deletions
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