[Modeling-cvs] ProjectModeling/Modeling CHANGES,1.129,1.130 Model.py,1.7,1.8 Entity.py,1.14,1.15 Attribute.py,1.16,1.17 Relationship.py,1.10,1.11 Join.py,1.3,1.4

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1:/tmp/cvs-serv18890

Modified Files:
	CHANGES Model.py Entity.py Attribute.py Relationship.py 
	Join.py 
Log Message:
Replaced 'Unimplemented' exception with NotImplementedError

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/CHANGES,v
retrieving revision 1.129
retrieving revision 1.130
diff -C2 -d -r1.129 -r1.130
*** CHANGES	21 Jul 2003 14:28:17 -0000	1.129
--- CHANGES	23 Jul 2003 12:17:41 -0000	1.130
***************
*** 8,11 ****
--- 8,14 ----
    --------------------------------------------------------
  
+   * Model, Entity, Attribute, Relationship, Join: replaced 'Unimplemented'
+     exception with NotImplementedError
+ 
    * Added documentation: handling custom types for attributes (2003/07/21)
  

Index: Model.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Model.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Model.py	8 Jul 2003 17:32:22 -0000	1.7
--- Model.py	23 Jul 2003 12:17:41 -0000	1.8
***************
*** 324,328 ****
    def isaValidEntityName(self):
      """
!     **Unimplemented** for the moment being (raise 'Unimplemented')
      Returns 'true' if modelSet() is 'None', or if modelSet() does not
      hold another model where an entity is already registered with the
--- 324,328 ----
    def isaValidEntityName(self):
      """
!     **Unimplemented** for the moment being (raise NotImplementedError)
      Returns 'true' if modelSet() is 'None', or if modelSet() does not
      hold another model where an entity is already registered with the
***************
*** 330,334 ****
      """
      # _TBD: bound to check + called by ModelSet when a Model is added
!     raise 'Unimplemented'
  
    def isEntityNameDeclaredInNamespace(self, aName):
--- 330,334 ----
      """
      # _TBD: bound to check + called by ModelSet when a Model is added
!     raise NotImplementedError
  
    def isEntityNameDeclaredInNamespace(self, aName):
***************
*** 385,389 ****
      """
      # _TBD: Note: same for attributes when flattened (derived? no) will be taken into account
!     raise 'Unimplemented'
          
    def setAdaptorName(self, adaptorName):
--- 385,389 ----
      """
      # _TBD: Note: same for attributes when flattened (derived? no) will be taken into account
!     raise NotImplementedError
          
    def setAdaptorName(self, adaptorName):
***************
*** 424,428 ****
    def validateObject(self, aModel):
      "Checks whether the supplied object is valid"
!     raise 'Unimplemented'
  
    # XML functionalities
--- 424,428 ----
    def validateObject(self, aModel):
      "Checks whether the supplied object is valid"
!     raise NotImplementedError
  
    # XML functionalities
***************
*** 476,480 ****
        node=parentNode
      else:
!       raise 'Unimplemented'
      exportAttrDict=self.xmlAttributesDict()
      for attr in exportAttrDict.keys():
--- 476,480 ----
        node=parentNode
      else:
!       raise NotImplementedError
      exportAttrDict=self.xmlAttributesDict()
      for attr in exportAttrDict.keys():

Index: Entity.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Entity.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Entity.py	7 Jul 2003 14:57:13 -0000	1.14
--- Entity.py	23 Jul 2003 12:17:41 -0000	1.15
***************
*** 910,915 ****
        raise ValueError, "Parameter 'PKs' must be a sequence"
      #if len(PKs)>1:
!     #  raise 'Unimplemented', 'Sorry, we only support singletons as PKs for '\
!     #        'the moment being'
      _ok=1
      _PKs=[]
--- 910,915 ----
        raise ValueError, "Parameter 'PKs' must be a sequence"
      #if len(PKs)>1:
!     #  raise NotImplementedError,'Sorry, we only support singletons as PKs '\
!     #        'for the moment being'
      _ok=1
      _PKs=[]
***************
*** 964,972 ****
      Sets the restricting qualifier.
  
!     Not implemented yet, this method unconditionally raises.
  
      See also: restrictingQualifier()
      """
!     raise 'Unimplemented', 'Unimplemented yet'
    
    def setTypeName(self, aName):
--- 964,973 ----
      Sets the restricting qualifier.
  
!     Not implemented yet, this method unconditionally raises
!     NotImplementedError.
  
      See also: restrictingQualifier()
      """
!     raise NotImplementedError, 'Unimplemented yet'
    
    def setTypeName(self, aName):

Index: Attribute.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Attribute.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Attribute.py	23 Jul 2003 11:22:23 -0000	1.16
--- Attribute.py	23 Jul 2003 12:17:41 -0000	1.17
***************
*** 594,598 ****
        elif self._isFlattened:
          return self.flattenedPropertySet()
!     raise 'Unimplemented', 'All cases are not properly covered!'
  
    ##
--- 594,598 ----
        elif self._isFlattened:
          return self.flattenedPropertySet()
!     raise NotImplementedError, 'All cases are not properly covered!'
  
    ##
***************
*** 679,683 ****
      - etc. TBD
      """
!     raise 'Unimplemented'
  
    ##
--- 679,683 ----
      - etc. TBD
      """
!     raise NotImplementedError
  
    ##

Index: Relationship.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Relationship.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Relationship.py	7 Jul 2003 14:57:13 -0000	1.10
--- Relationship.py	23 Jul 2003 12:17:41 -0000	1.11
***************
*** 608,612 ****
      - 
      """
!     raise 'Unimplemented'
  
    def validateValue(self, value, object=None):
--- 608,612 ----
      - 
      """
!     raise NotImplementedError
  
    def validateValue(self, value, object=None):
***************
*** 1052,1056 ****
      - 
      """
!     raise 'Unimplemented'
  
    def validateValue(self, value, object=None):
--- 1052,1056 ----
      - 
      """
!     raise NotImplementedError
  
    def validateValue(self, value, object=None):

Index: Join.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Join.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Join.py	14 Mar 2003 11:40:09 -0000	1.3
--- Join.py	23 Jul 2003 12:17:41 -0000	1.4
***************
*** 109,115 ****
      """
      Cannot be called: initialization from XML is made by relationships.
!     Raises 'Nonsense'.
      """
!     raise 'Nonsense' # Just a reminder
    
    def getXMLDOM(self, doc=None, parentNode=None, encoding='iso-8859-1'):
--- 109,116 ----
      """
      Cannot be called: initialization from XML is made by relationships.
!     Raises NotImplementedError.
      """
!     # Just a reminder
!     raise NotImplementedError, 'Calling it on a join is a nonsense
    
    def getXMLDOM(self, doc=None, parentNode=None, encoding='iso-8859-1'):