← Back to team overview

oship-dev team mailing list archive

[Branch ~oship-dev/oship/devel] Rev 526: Enforced invariants and implemented representation

 

------------------------------------------------------------
revno: 526
fixes bug(s): https://launchpad.net/bugs/625624
committer: Eduardo César <>
branch nick: local
timestamp: Thu 2010-12-16 00:52:42 -0200
message:
  Enforced invariants and implemented representation
modified:
  src/oship/openehr/rm/common/generic/__init__.py
  src/oship/openehr/rm/common/generic/interfaces.py


--
lp:oship
https://code.launchpad.net/~oship-dev/oship/devel

Your team OSHIP Development Team is subscribed to branch lp:oship.
To unsubscribe from this branch go to https://code.launchpad.net/~oship-dev/oship/devel/+edit-subscription
=== modified file 'src/oship/openehr/rm/common/generic/__init__.py'
--- src/oship/openehr/rm/common/generic/__init__.py	2010-09-27 14:34:15 +0000
+++ src/oship/openehr/rm/common/generic/__init__.py	2010-12-16 02:52:42 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 
 from zope.interface import Interface
 import grok
@@ -134,16 +134,24 @@
 
     grok.implements(IRevisionHistoryItem)
 
-    def __init__(self, audits, verid):
+    def __init__(self, audits, version_id):
         self.audits=audits
-        self.versionId=verid
-
-    def auditValid():
+        self.version_id=version_id
+        self.audit_valid()
+        self.version_id_valid()
+
+    def __repr__(self):
+        return 'RevisionHistoryItem(audits=%s, version_id=%s)' % (self.audits, self.version_id)
+
+    def audit_valid(self):
         u"""audits is not None and audits != ' """
-
-    def versionIdValid():
+        if self.audits is None:
+            raise ValueError(u'audits /= Void and then not audits.is_empty')
+        
+    def version_id_valid(self):
         u"""versionId is not None"""
-
+        if self.version_id is None:
+            raise ValueError(u'version_id /= Void')
 
 class RevisionHistory(grok.Model):
     u"""

=== modified file 'src/oship/openehr/rm/common/generic/interfaces.py'
--- src/oship/openehr/rm/common/generic/interfaces.py	2010-08-06 21:24:11 +0000
+++ src/oship/openehr/rm/common/generic/interfaces.py	2010-12-16 02:52:42 +0000
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 
 
 from zope.interface import Interface
@@ -308,12 +308,6 @@
 
     )
 
-    def auditValid():
-        u"""audits is not None and audits != ' """
-
-    def versionIdValid():
-        u"""versionId is not None"""
-
 
 class IRevisionHistory(Interface):
     u"""