# HG changeset patch # User Sandro Knauß # Date 1330012326 -3600 # Node ID 55ab949cf0f8bbc17a159cbff65e07467bb34c1b # Parent af65fcbd59d5073055742c77b127065889414656 providers now handeld in offer.provider diff -r af65fcbd59d5 -r 55ab949cf0f8 iro/offer/__init__.py --- a/iro/offer/__init__.py Wed Feb 22 03:48:10 2012 +0100 +++ b/iro/offer/__init__.py Thu Feb 23 16:52:06 2012 +0100 @@ -1,15 +1,4 @@ from .offer import Offer -from .provider import Provider - -from ..error import NoProvider - -providers={} - -def getProvider(name, typ, config): - try: - return providers[typ](name,config) - except KeyError: - raise NoProvider(typ) - +from .provider import Provider, providers, getProvider from .smtp import SMTP from .smstrade import Smstrade diff -r af65fcbd59d5 -r 55ab949cf0f8 iro/offer/provider.py --- a/iro/offer/provider.py Wed Feb 22 03:48:10 2012 +0100 +++ b/iro/offer/provider.py Thu Feb 23 16:52:06 2012 +0100 @@ -26,3 +26,15 @@ raise NoTyp(route) return partial(self.send, typ, route) +def getProvider(name, typ, config): + try: + return providers[typ](name,config) + except KeyError: + raise NoProvider(typ) + +def vProvider(typ, field): + if typ not in providers.keys(): + raise ValidateException() + return typ + +providers={} diff -r af65fcbd59d5 -r 55ab949cf0f8 iro/offer/smstrade.py --- a/iro/offer/smstrade.py Wed Feb 22 03:48:10 2012 +0100 +++ b/iro/offer/smstrade.py Thu Feb 23 16:52:06 2012 +0100 @@ -18,8 +18,7 @@ from ..error import UnknownOption, NeededOption from ..model.status import Status -from .provider import Provider -from ..offer import providers +from .provider import Provider, providers import logging logger=logging.getLogger("smstrade") diff -r af65fcbd59d5 -r 55ab949cf0f8 iro/offer/smtp.py --- a/iro/offer/smtp.py Wed Feb 22 03:48:10 2012 +0100 +++ b/iro/offer/smtp.py Thu Feb 23 16:52:06 2012 +0100 @@ -15,9 +15,7 @@ import copy from ..model.status import Status -from ..error import UnknownOption, NeededOption -from ..offer import providers -from .provider import Provider +from .provider import Provider, providers class SMTP(Provider): def __init__(self, name, config):