Update to work with Python 3 (only)

Also bump the version to 0.2

README.txt

@@ -1,5 +1,5 @@
 THIS IS
-A Python wrapper around the SMS gateway from CPSMS <https://www.cpsms.dk/>.
+A Python 3 wrapper around the SMS gateway from CPSMS <https://www.cpsms.dk/>.
 
 THIS IS NOT
 Some sort of magic, free SMS gateway.

cpsms/__init__.py

@@ -0,0 +1,3 @@
+"""The cpsms package."""
+
+from .cpsms import Gateway

cpsms/cpsms.py

@@ -1,8 +1,5 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-'
-
 """
-Copyright 2010, 2011 Mikkel Munch Mortensen <3xm@detfalskested.dk>.
+Copyright 2010-2021 Mikkel Munch Mortensen <3xm@detfalskested.dk>.
 
 This file is part of SMS Gateway.
 
@@ -20,89 +17,105 @@ You should have received a copy of the GNU General Public License
 along with SMS Gateway.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-import urllib, getopt
+import getopt
+from urllib.parse import urlencode
+from urllib.request import urlopen
+from typing import Any, Tuple
 
-class Gateway():
-	'''
-	A Python wrapper around the SMS gateway from CPSMS <https://www.cpsms.dk/>.
 
-	Please look at the README for further description.
+class Gateway:
-	'''
+    """
-	default_options = {
+    A Python wrapper around the SMS gateway from CPSMS <https://www.cpsms.dk/>.
-		'recipients' : [],
-		'message' : '',        # Should be a unicode string.
-		'callback_url' : '',
-		'timestamp' : '',      # For delaying messages. Format: YYYYMMDDHHMM.
-		'utf8' : 1,
-		'flash' : 0,
-		'group' : 0,
-		'gateway_base_url' : 'https://www.cpsms.dk/sms/?'
-	}
-	options = {}
-	
-	def __init__(self, username, password, sender_name, options = None):
-		'''
-		Initialize SMS gateway, with some options.
-		'''
-		self.options = self.default_options
-		if options != None:
-			self.options.update(options)
 
-		self.options['username'] = username
+    Please look at the README for further description.
-		self.options['password'] = password
+    """
-		self.options['from'] = sender_name
+
-	
+    options: dict[str, Any] = {}
-	def add_recipient(self, number):
+
-		'''
+    @property
-		Add a number to the list of recipients.
+    def default_options(self) -> dict[str, Any]:
-		'''
+        return {
-		self.options['recipients'].append(number)
+            "recipients": [],
-	
+            "message": "",
-	def send(self, message = None):
+            "callback_url": "",
-		'''
+            "timestamp": "",  # For delaying messages. Format: YYYYMMDDHHMM.
-			Send the message specified in self.options to all recipients. Optionally, override the message to be sent.
+            "utf8": True,
-		'''
+            "flash": False,
-		# Decide what to send
+            "group": False,
-		if message == None:
+            "gateway_base_url": "https://www.cpsms.dk/sms/?",
-			message = self.options['message']
+        }
-		
+
-		# Raise error if message is empty.
+    def __init__(
-		if len(message) == 0:
+        self,
-			raise ValueError('Message empty.')
+        username: str,
-		
+        password: str,
-		# Raise error if message is too long.
+        sender_name: str,
-		if len(message) > 459:
+        options: dict[str, Any] = None,
-			raise ValueError('Message not allowed to be more than 459 characters. Current message is %i characters.' % len(message))
+    ) -> None:
-		
+        """Initialize SMS gateway, with some options."""
-		# Raise error if recipients is empty.
+        self.options = self.default_options
-		if len(self.options['recipients']) == 0:
+        if options is not None:
-			raise ValueError('No recipients.')
+            self.options.update(options)
-		
+
-		# Construct gateway URL.
+        self.options["username"] = username
-		options = [
+        self.options["password"] = password
-			('username', self.options['username']),
+        self.options["from"] = sender_name
-			('password', self.options['password']),
+
-			('message', message.encode('utf-8')),
+    def add_recipient(self, number: str) -> None:
-			('from', self.options['from']),
+        """Add a number to the list of recipients."""
-			('utf8', self.options['utf8']),
+        self.options["recipients"].append(number)
-			('flash', self.options['flash']),
+
-			('group', self.options['group']),
+    def send(self, message: str = None) -> Tuple[bool, str]:
-			('url', self.options['callback_url']),
+        """
-		]
+        Send the message specified in self.options to all recipients.
-		
+
-		for r in self.options['recipients']:
+        Optionally, override the message to be sent.
-			options.append(('recipient[]', r))
+        """
-		
+        # Decide what to send.
-		if self.options['timestamp'] != '':
+        if message is None:
-			options.append(('timestamp', self.options['timestamp']))
+            message = self.options["message"]
-		
+
-		url = self.options['gateway_base_url'] + urllib.urlencode(options)
+        # Raise error if message is empty.
-		
+        if message == "":
-		# Send SMS.
+            raise ValueError("Message empty.")
-		remote_call = urllib.urlopen(url)
+
-		result = remote_call.read()
+        # Raise error if message is too long.
-		remote_call.close()
+        if len(message) > 459:
-		if result.find('<succes>') > -1:
+            raise ValueError(
-			return True, result
+                "Message not allowed to be more than 459 characters."
-		else:
+                "Current message is %i characters." % len(message)
-			return False, result
+            )
+
+        # Raise error if recipients is empty.
+        if len(self.options["recipients"]) == 0:
+            raise ValueError("No recipients.")
+
+        # Construct gateway URL.
+        options = [
+            ("username", self.options["username"]),
+            ("password", self.options["password"]),
+            ("message", message),
+            ("from", self.options["from"]),
+            ("utf8", int(self.options["utf8"])),
+            ("flash", int(self.options["flash"])),
+            ("group", int(self.options["group"])),
+            ("url", self.options["callback_url"]),
+        ]
+
+        for r in self.options["recipients"]:
+            options.append(("recipient[]", r))
+
+        if self.options["timestamp"] != "":
+            options.append(("timestamp", self.options["timestamp"]))
+
+        url = self.options["gateway_base_url"] + urlencode(options)
+        print(url)
+
+        # Send SMS.
+        remote_call = urlopen(url)
+        result = remote_call.read().decode()
+        remote_call.close()
+        if result.find("<succes>") > -1:
+            return True, result
+        else:
+            return False, result

examples.py

@@ -1,8 +1,5 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-'
-
 """
-Copyright 2010, 2011 Mikkel Munch Mortensen <3xm@detfalskested.dk>.
+Copyright 2010-2021 Mikkel Munch Mortensen <3xm@detfalskested.dk>.
 
 This file is part of SMS Gateway.
 
@@ -23,13 +20,18 @@ along with SMS Gateway.  If not, see <http://www.gnu.org/licenses/>.
 import cpsms
 
 # The easiest way to send a single message.
-gateway1 = cpsms.Gateway('username', 'password', 'SMS Test')
+gateway1 = cpsms.Gateway("username", "password", "Sender Name")
-gateway1.add_recipient('+4512345678')
+gateway1.add_recipient("+4512345678")
-print gateway1.send(u'One way of sending a massage.')
+print(gateway1.send("One way of sending a massage."))
 
 # The easiest way to send a message to multiple recipients.
-gateway2 = cpsms.Gateway('username', 'password', 'SMS Test', {
+gateway2 = cpsms.Gateway(
-	'recipients' : ['+4512345678', '+4587654321'],
+    "username",
-	'message' : u'Another way of sending a message.',
+    "password",
-})
+    "SMS Test",
-print gateway2.send()
+    {
+        "recipients": ["+4512345678", "+4587654321"],
+        "message": "Another way of sending a message.",
+    },
+)
+print(gateway2.send())

setup.py

@@ -2,20 +2,22 @@ from distutils.core import setup
 
 
 setup(
-    name='cpsms',
+    name="cpsms",
-    packages=['cpsms'],
+    packages=["cpsms"],
-    version='0.1',
+    version="0.2",
-    author='Mikkel Munch Mortensen',
+    author="Mikkel Munch Mortensen",
-    author_email='3xm@detfalskested.dk',
+    author_email="3xm@detfalskested.dk",
-    url='https://github.com/decibyte/cpsms',
+    url="https://github.com/decibyte/cpsms",
-    description='A Python wrapper around the SMS gateway ' \
+    description=(
-        'from CPSMS <https://www.cpsms.dk/>.',
+        "A Python wrapper around the SMS gateway from "
-    classifiers = [
+        "CPSMS <https://www.cpsms.dk/>."
-        'Programming Language :: Python',
+    ),
-        'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
+    classifiers=[
-        'Operating System :: OS Independent',
+        "Programming Language :: Python",
-        'Development Status :: 4 - Beta',
+        "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-        'Intended Audience :: Developers',
+        "Operating System :: OS Independent",
-        'Topic :: Communications :: Telephony',
+        "Development Status :: 4 - Beta",
-    ]
+        "Intended Audience :: Developers",
+        "Topic :: Communications :: Telephony",
+    ],
 )