passing all tests: offer now has a __eq__ function devel
authorSandro Knauß <knauss@netzguerilla.net>
Tue, 14 Feb 2012 15:47:42 +0100
branchdevel
changeset 160 f4e4f4ba25fb
parent 159 fbd7364b252d
child 161 072ee139eb67
passing all tests: offer now has a __eq__ function
iro/model/offer.py
iro/offer/offer.py
--- a/iro/model/offer.py	Mon Feb 13 23:27:22 2012 +0100
+++ b/iro/model/offer.py	Tue Feb 14 15:47:42 2012 +0100
@@ -26,7 +26,7 @@
     for provider in ( s for s in config.sections() if not s in ["main",]):
         p=getProvider(provider,config.get(provider,"typ"),config.items(provider))
         for r in p.routes:
-            for o in  session.query(schema.Offer.name, schema.Offer.route).filter(and_(schema.Offer.provider==provider,
+            for o in  session.query(schema.Offer.name, schema.Offer.typ).filter(and_(schema.Offer.provider==provider,
                 schema.Offer.route==r)):
                     offers[o[0]]=Offer(provider=p,route=r,typ=o[1],name=o[0])
         providers[provider]=p
--- a/iro/offer/offer.py	Mon Feb 13 23:27:22 2012 +0100
+++ b/iro/offer/offer.py	Tue Feb 14 15:47:42 2012 +0100
@@ -9,3 +9,13 @@
 
     def send(self, recipient, message):
         return Status(self.name, Status.error, errtext="Error: Test")
+
+    def __eq__(self,o):
+        return (self.name == o.name) and (self.route == o.route) and (self.provider == o.provider) and (self.typ == o.typ)
+
+    def __neq__(self,o):
+        return not self.__eq__(o)
+
+    def __repr__(self):
+        return "<Offer(%s,%s:%s,%s)>"%(self.name,self.provider,self.route,self.typ)
+