Adjust, fix, and add some __repr__ methods.

fmn/lib/models.py

@@ -183,7 +183,7 @@ def __json__(self):
         }
 
     def __repr__(self):
-        return "<fmn.lib.models.User %r %r>" % (self.openid, self.openid_url)
+        return "<fmn.lib.models.User: %r %r>" % (self.openid, self.openid_url)
 
     @classmethod
     def by_openid(cls, session, openid):
@@ -248,7 +248,7 @@ def __json__(self):
         }
 
     def __repr__(self):
-        return "<fmn.lib.models.Rule %r(**%r)>" % (
+        return "<fmn.lib.models.Rule: %r(**%r)>" % (
             self.code_path, self.arguments)
 
     @hybrid_property
@@ -316,7 +316,7 @@ def __json__(self):
         }
 
     def __repr__(self):
-        return "<fmn.lib.models.Filter %r>" % (self.name)
+        return "<fmn.lib.models.Filter: %r>" % (self.name)
 
     @classmethod
     def create(cls, session, name):
@@ -442,6 +442,10 @@ def __json__(self):
             'detail_values': [v.value for v in self.detail_values],
         }
 
+    def __repr__(self):
+        return "<fmn.lib.models.Preference: %r %r>" % (
+            self.openid, self.context_name)
+
     @property
     def should_batch(self):
         """ If the user has any batching preferences at all, then we should """
@@ -648,8 +652,8 @@ class Confirmation(BASE):
         sa.UniqueConstraint('openid', 'context_name'),
     )
 
-    def repr(self):
-        return "<Confirmation user:%s, context:%s, status:%s>" % (
+    def __repr__(self):
+        return "<fmn.lib.models.Confirmation: %r %r %r>" % (
             self.openid, self.context_name, self.status)
 
     @classmethod