oship-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 509
committer: Eduardo César
branch nick: local
timestamp: Mon 2010-11-15 11:13:11 -0200
message:
  Minor fixes in invariants
modified:
  src/oship/openehr/rm/composition/content/entry/__init__.py
  src/oship/openehr/rm/demographic/__init__.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/composition/content/entry/__init__.py'
--- src/oship/openehr/rm/composition/content/entry/__init__.py	2010-11-15 13:04:43 +0000
+++ src/oship/openehr/rm/composition/content/entry/__init__.py	2010-11-15 13:13:11 +0000
@@ -124,7 +124,7 @@
 
     def actionArchetypeIdValid(self):
         if self.actionArchetypeId != None and self.actionArchetypeId.isEmpty:
-            raise "actionArchetypeId not valid"
+            raise Invalid("actionArchetypeId not valid")
 
 class InstructionDetails(Pathable):
     """
@@ -142,7 +142,7 @@
 
     def activityPathValid(self):
         if self.activityId != None and bool(self.activityId.isEmpty):
-            raise "activityId is not valid"
+            raise Invalid("activityId is not valid")
 
 
 class Instruction(CareEntry):

=== modified file 'src/oship/openehr/rm/demographic/__init__.py'
--- src/oship/openehr/rm/demographic/__init__.py	2010-10-29 14:35:36 +0000
+++ src/oship/openehr/rm/demographic/__init__.py	2010-11-15 13:13:11 +0000
@@ -215,7 +215,7 @@
         self.addresses = addresses
         self.links = links
         if self.addresses != None and bool(self.addresses.empty):
-            raise "addresses.empty is not valid"
+            raise Invalid("addresses.empty is not valid")
 
 
     def __repr__(self):
@@ -336,7 +336,7 @@
         self.performer=performer
 
         if self.capabilities != None and bool(self.capabilities.empty):
-            raise "capabilities.empty is not valid"
+            raise ("capabilities.empty is not valid")
 
     def __repr__(self):
         return "Role(capabilities=%s, timeValidity=%s, performer=%s)" % (self.capabilities, self.timeValidity, self.performer)