--- a/iro/anbieter/sipgate.py Mon Jan 30 21:36:12 2012 +0100
+++ b/iro/anbieter/sipgate.py Mon Jan 30 21:40:46 2012 +0100
@@ -13,7 +13,7 @@
from anbieter import anbieter
-from telnumber import telnumber, NotATelNumber
+from telnumber import telnumber, InvalidTel
import ConfigParser
import xmlrpclib
import logging
@@ -108,7 +108,7 @@
self.__send_method(serv.samurai.SessionInitiate, args)
self.updateStatus(arranged=recipient)
- except (NotATelNumber, NoValidStatusCode):
+ except (InvalidTel, NoValidStatusCode):
self.updateStatus(failed=recipient)
self.__disconnect()
--- a/iro/anbieter/smstrade.py Mon Jan 30 21:36:12 2012 +0100
+++ b/iro/anbieter/smstrade.py Mon Jan 30 21:40:46 2012 +0100
@@ -14,7 +14,7 @@
from anbieter import anbieter
from sipgate import NoValidStatusCode
-from telnumber import telnumber, NotATelNumber
+from telnumber import telnumber, InvalidTel
import ConfigParser
import urllib, httplib
from httplib import socket
@@ -111,7 +111,7 @@
self.updateStatus(arranged=recipient)
else:
self.updateStatus(failed=recipient)
- except (NotATelNumber,NoValidStatusCode,InternetConnectionError):
+ except (InvalidTel,NoValidStatusCode,InternetConnectionError):
self.updateStatus(failed=recipient)
def __send(self, route, to, message, timestamp=None):
--- a/iro/error.py Mon Jan 30 21:36:12 2012 +0100
+++ b/iro/error.py Mon Jan 30 21:40:46 2012 +0100
@@ -40,7 +40,7 @@
def __str__(self):
return "%i:%s"%(self.code,self.msg)
-class NotATelNumber(ValidateException):
+class InvalidTel(ValidateException):
def __init__(self, number,field=None):
self.number = number
msg = "No valid telnumber: '%s'"%(number)
--- a/iro/telnumber.py Mon Jan 30 21:36:12 2012 +0100
+++ b/iro/telnumber.py Mon Jan 30 21:40:46 2012 +0100
@@ -13,7 +13,7 @@
import re
-from .error import NotATelNumber
+from .error import InvalidTel
class Telnumber:
re_telnum=re.compile(r'^\s*(\+)?([0-9\s\-/\(\)]){5,}\s*$')
@@ -28,7 +28,7 @@
def createNumber(self, number):
if not self.re_telnum.match(number):
- raise NotATelNumber(number)
+ raise InvalidTel(number)
self.land=self.std_land
--- a/iro/validate.py Mon Jan 30 21:36:12 2012 +0100
+++ b/iro/validate.py Mon Jan 30 21:40:46 2012 +0100
@@ -4,7 +4,7 @@
from decorator import decorator
from inspect import getcallargs
-from .error import ValidateException, NotATelNumber, InvalidMail
+from .error import ValidateException, InvalidTel, InvalidMail
from .telnumber import Telnumber
def vBool(value, field):
@@ -35,7 +35,7 @@
for v in value:
try:
ret.append(Telnumber(v))
- except NotATelNumber, e:
+ except InvalidTel, e:
e.field=field
raise e
return ret
--- a/tests/telnumber.py Mon Jan 30 21:36:12 2012 +0100
+++ b/tests/telnumber.py Mon Jan 30 21:40:46 2012 +0100
@@ -1,7 +1,7 @@
import unittest
from iro.validate import vTel
-from iro.error import NotATelNumber
+from iro.error import InvalidTel
from iro.telnumber import Telnumber
class testTelefonnumbers(unittest.TestCase):
@@ -19,11 +19,11 @@
numbers=['xa','+1','1-23',';:+0','0123']
for number in numbers:
- with self.assertRaises(NotATelNumber) as e:
+ with self.assertRaises(InvalidTel) as e:
vTel([number], None)
self.failUnlessEqual(e.exception.number,number)
- with self.assertRaises(NotATelNumber) as e:
+ with self.assertRaises(InvalidTel) as e:
vTel(['01234']+numbers, None)
self.failUnlessEqual(e.exception.number,numbers[0])
@@ -33,8 +33,8 @@
def testWrongNumber(self):
telnum=Telnumber()
- self.assertRaises(NotATelNumber, telnum.createNumber, "hallo")
- self.assertRaises(NotATelNumber, telnum.createNumber, "0?242")
+ self.assertRaises(InvalidTel, telnum.createNumber, "hallo")
+ self.assertRaises(InvalidTel, telnum.createNumber, "0?242")
def testNumber(self):