More validation in senderinfo

Author: mohanjith

MANIFEST

@@ -0,0 +1,28 @@
+# file GENERATED by distutils, do NOT edit
+setup.py
+finvoice/__init__.py
+finvoice/finvoice.py
+finvoice/finvoice201.py
+finvoice/finvoice201subs.py
+finvoice/finvoicesubs.py
+finvoice/ack/__init__.py
+finvoice/ack/ack.py
+finvoice/ack/ackEb.py
+finvoice/ack/ackEbsubs.py
+finvoice/ack/acksubs.py
+finvoice/attachment/__init__.py
+finvoice/attachment/attachment.py
+finvoice/attachment/attachmentsubs.py
+finvoice/receiver/__init__.py
+finvoice/receiver/receiverinfo.py
+finvoice/receiver/receiverinfosubs.py
+finvoice/receiver/receiverproposal.py
+finvoice/receiver/receiverproposalsubs.py
+finvoice/sender/__init__.py
+finvoice/sender/senderinfo.py
+finvoice/sender/senderinfosubs.py
+finvoice/soap/__init__.py
+finvoice/soap/envelope.py
+finvoice/soap/envelopesubs.py
+finvoice/soap/msgheader.py
+finvoice/soap/msgheadersubs.py

README.md

@@ -7,7 +7,7 @@ Finvoice message can be used for invoicing and for other business messages, such
 
 This Python module is based on the XSDs released by the Federation of Financial Services, Finland. 
 
-#Tested
+# Tested
 
 XML generated have been validated.
 

finvoice/sender/senderinfo.py

@@ -479,7 +479,6 @@ def find_attr_value_(attr_name, node):
 class GDSParseError(Exception):
     pass
 
-
 def raise_parse_error(node, msg):
     if XMLParser_import_library == XMLParser_import_lxml:
         msg = '%s (element %s/line %d)' % (
@@ -489,6 +488,13 @@ def raise_parse_error(node, msg):
     raise GDSParseError(msg)
 
 
+class GDSValueError(Exception):
+    pass
+
+def raise_value_error(value, msg):
+    msg = '%s (got "%s")' % (msg, value, )
+    raise GDSValueError(msg)
+
 class MixedContainer:
     # Constants for category:
     CategoryNone = 0
@@ -676,10 +682,26 @@ def get_Version(self): return self.Version
     def set_Version(self, Version): self.Version = Version
     def validate_genericStringType5_35(self, value):
         # Validate type genericStringType5_35, a restriction on xs:string.
-        pass
+        if ( 5 <= value.__len__() <= 35 ):
+            pass
+        else:
+            raise_parse_error( value.__len__(), 'Expected value between 5..35 characters' )
+        return value
     def validate_YesNoType(self, value):
         # Validate type YesNoType, a restriction on xs:NMTOKEN.
-        pass
+        if ( value != "YES" and value != "NO" ):
+            raise_parse_error( value, 'Expected "YES" or "NO"' )
+        return value
+    def validate_genericStringValue5_35(self, value):
+        if ( 5 <= value.__len__() <= 35 ):
+            pass
+        else:
+            raise_value_error( value.__len__(), 'Expected value between 5..35 characters' )
+        return value
+    def validate_YesNoValue(self, value):
+        if ( value != "YES" and value != "NO" ):
+            raise_value_error( value, 'Expected "YES" or "NO"' )
+        return value
     def hasContent_(self):
         if (
             self.MessageDetails is not None or
@@ -726,6 +748,7 @@ def exportChildren(self, outfile, level, namespace_='', name_='FinvoiceSenderInf
         if self.SellerPartyDetails is not None:
             self.SellerPartyDetails.export(outfile, level, namespace_, name_='SellerPartyDetails', pretty_print=pretty_print)
         if self.SellerOrganisationUnitNumber is not None:
+            self.validate_genericStringValue5_35(self.SellerOrganisationUnitNumber)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sSellerOrganisationUnitNumber>%s</%sSellerOrganisationUnitNumber>%s' % (namespace_, self.gds_format_string(quote_xml(self.SellerOrganisationUnitNumber).encode(ExternalEncoding), input_name='SellerOrganisationUnitNumber'), namespace_, eol_))
         if self.InvoiceSenderInformationDetails is not None:
@@ -735,9 +758,11 @@ def exportChildren(self, outfile, level, namespace_='', name_='FinvoiceSenderInf
         if self.SellerInvoiceDetails is not None:
             self.SellerInvoiceDetails.export(outfile, level, namespace_, name_='SellerInvoiceDetails', pretty_print=pretty_print)
         if self.ProposedDueDateAccepted is not None:
+            self.validate_YesNoValue(self.ProposedDueDateAccepted)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sProposedDueDateAccepted>%s</%sProposedDueDateAccepted>%s' % (namespace_, self.gds_format_string(quote_xml(self.ProposedDueDateAccepted).encode(ExternalEncoding), input_name='ProposedDueDateAccepted'), namespace_, eol_))
         if self.ProposedInvoicePeriodAccepted is not None:
+            self.validate_YesNoValue(self.ProposedInvoicePeriodAccepted)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sProposedInvoicePeriodAccepted>%s</%sProposedInvoicePeriodAccepted>%s' % (namespace_, self.gds_format_string(quote_xml(self.ProposedInvoicePeriodAccepted).encode(ExternalEncoding), input_name='ProposedInvoicePeriodAccepted'), namespace_, eol_))
     def exportLiteral(self, outfile, level, name_='FinvoiceSenderInfo'):
@@ -765,6 +790,7 @@ def exportLiteralChildren(self, outfile, level, name_):
             showIndent(outfile, level)
             outfile.write('),\n')
         if self.SellerOrganisationUnitNumber is not None:
+            self.validate_genericStringValue5_35(self.SellerOrganisationUnitNumber)
             showIndent(outfile, level)
             outfile.write('SellerOrganisationUnitNumber=%s,\n' % quote_python(self.SellerOrganisationUnitNumber).encode(ExternalEncoding))
         if self.InvoiceSenderInformationDetails is not None:
@@ -792,9 +818,11 @@ def exportLiteralChildren(self, outfile, level, name_):
             showIndent(outfile, level)
             outfile.write('),\n')
         if self.ProposedDueDateAccepted is not None:
+            self.validate_YesNoValue(self.ProposedDueDateAccepted)
             showIndent(outfile, level)
             outfile.write('ProposedDueDateAccepted=%s,\n' % quote_python(self.ProposedDueDateAccepted).encode(ExternalEncoding))
         if self.ProposedInvoicePeriodAccepted is not None:
+            self.validate_YesNoValue(self.ProposedInvoicePeriodAccepted)
             showIndent(outfile, level)
             outfile.write('ProposedInvoicePeriodAccepted=%s,\n' % quote_python(self.ProposedInvoicePeriodAccepted).encode(ExternalEncoding))
     def build(self, node):
@@ -884,16 +912,60 @@ def get_NewInvoiceSenderIntermediatorAddress(self): return self.NewInvoiceSender
     def set_NewInvoiceSenderIntermediatorAddress(self, NewInvoiceSenderIntermediatorAddress): self.NewInvoiceSenderIntermediatorAddress = NewInvoiceSenderIntermediatorAddress
     def validate_genericStringType0_70(self, value):
         # Validate type genericStringType0_70, a restriction on xs:string.
-        pass
+        if ( 0 <= value.__len__() <= 70 ):
+            pass
+        else:
+            raise_parse_error( value.__len__(), 'Expected value between 0..70 characters' )
+        return value
     def validate_genericStringType0_512(self, value):
         # Validate type genericStringType0_512, a restriction on xs:string.
-        pass
+        if ( 0 <= value.__len__() <= 512 ):
+            pass
+        else:
+            raise_parse_error( value.__len__(), 'Expected value between 0..512 characters' )
+        return value
     def validate_genericStringType0_35(self, value):
         # Validate type genericStringType0_35, a restriction on xs:string.
-        pass
+        if ( 0 <= value.__len__() <= 35 ):
+            pass
+        else:
+            raise_parse_error( value.__len__(), 'Expected value between 0..35 characters' )
+        return value
     def validate_genericNMtokenType8_11(self, value):
         # Validate type genericNMtokenType8_11, a restriction on genericNMtokenType.
-        pass
+        if ( 8 <= value.__len__() <= 11 ):
+            pass
+        else:
+            raise_parse_error( value.__len__(), 'Expected value between 8..11 characters' )
+        return value
+    def validate_genericStringValue0_70(self, value):
+        # Validate type genericStringType0_70, a restriction on xs:string.
+        if ( 0 <= value.__len__() <= 70 ):
+            pass
+        else:
+            raise_value_error( value.__len__(), 'Expected value between 0..70 characters' )
+        return value
+    def validate_genericStringValue0_512(self, value):
+        # Validate type genericStringType0_512, a restriction on xs:string.
+        if ( 0 <= value.__len__() <= 512 ):
+            pass
+        else:
+            raise_value_error( value.__len__(), 'Expected value between 0..512 characters' )
+        return value
+    def validate_genericStringValue0_35(self, value):
+        # Validate type genericStringType0_35, a restriction on xs:string.
+        if ( 0 <= value.__len__() <= 35 ):
+            pass
+        else:
+            raise_value_error( value.__len__(), 'Expected value between 0..35 characters' )
+        return value
+    def validate_genericNMtokenValue8_11(self, value):
+        # Validate type genericNMtokenType8_11, a restriction on genericNMtokenType.
+        if ( 8 <= value.__len__() <= 11 ):
+            pass
+        else:
+            raise_value_error( value.__len__(), 'Expected value between 8..11 characters' )
+        return value
     def hasContent_(self):
         if (
             self.SellerWebaddressNameText is not None or
@@ -932,21 +1004,27 @@ def exportChildren(self, outfile, level, namespace_='', name_='InvoiceSenderInfo
         else:
             eol_ = ''
         if self.SellerWebaddressNameText is not None:
+            self.validate_genericStringValue0_70(self.SellerWebaddressNameText)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sSellerWebaddressNameText>%s</%sSellerWebaddressNameText>%s' % (namespace_, self.gds_format_string(quote_xml(self.SellerWebaddressNameText).encode(ExternalEncoding), input_name='SellerWebaddressNameText'), namespace_, eol_))
         if self.SellerWebaddressText is not None:
+            self.validate_genericStringValue0_512(self.SellerWebaddressText)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sSellerWebaddressText>%s</%sSellerWebaddressText>%s' % (namespace_, self.gds_format_string(quote_xml(self.SellerWebaddressText).encode(ExternalEncoding), input_name='SellerWebaddressText'), namespace_, eol_))
         if self.InvoiceSenderAddress is not None:
+            self.validate_genericStringValue0_35(self.InvoiceSenderAddress)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sInvoiceSenderAddress>%s</%sInvoiceSenderAddress>%s' % (namespace_, self.gds_format_string(quote_xml(self.InvoiceSenderAddress).encode(ExternalEncoding), input_name='InvoiceSenderAddress'), namespace_, eol_))
         if self.InvoiceSenderIntermediatorAddress is not None:
+            self.validate_genericNMtokenValue8_11(self.InvoiceSenderIntermediatorAddress)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sInvoiceSenderIntermediatorAddress>%s</%sInvoiceSenderIntermediatorAddress>%s' % (namespace_, self.gds_format_string(quote_xml(self.InvoiceSenderIntermediatorAddress).encode(ExternalEncoding), input_name='InvoiceSenderIntermediatorAddress'), namespace_, eol_))
         if self.NewInvoiceSenderAddress is not None:
+            self.validate_genericStringValue0_35(self.NewInvoiceSenderAddress)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sNewInvoiceSenderAddress>%s</%sNewInvoiceSenderAddress>%s' % (namespace_, self.gds_format_string(quote_xml(self.NewInvoiceSenderAddress).encode(ExternalEncoding), input_name='NewInvoiceSenderAddress'), namespace_, eol_))
         if self.NewInvoiceSenderIntermediatorAddress is not None:
+            self.validate_genericNMtokenValue8_11(self.NewInvoiceSenderIntermediatorAddress)
             showIndent(outfile, level, pretty_print)
             outfile.write('<%sNewInvoiceSenderIntermediatorAddress>%s</%sNewInvoiceSenderIntermediatorAddress>%s' % (namespace_, self.gds_format_string(quote_xml(self.NewInvoiceSenderIntermediatorAddress).encode(ExternalEncoding), input_name='NewInvoiceSenderIntermediatorAddress'), namespace_, eol_))
     def exportLiteral(self, outfile, level, name_='InvoiceSenderInformationDetailsType'):
@@ -959,21 +1037,27 @@ def exportLiteralAttributes(self, outfile, level, already_processed, name_):
         pass
     def exportLiteralChildren(self, outfile, level, name_):
         if self.SellerWebaddressNameText is not None:
+            self.validate_genericStringValue0_70(self.SellerWebaddressNameText)
             showIndent(outfile, level)
             outfile.write('SellerWebaddressNameText=%s,\n' % quote_python(self.SellerWebaddressNameText).encode(ExternalEncoding))
         if self.SellerWebaddressText is not None:
+            self.validate_genericStringValue0_512(self.SellerWebaddressText)
             showIndent(outfile, level)
             outfile.write('SellerWebaddressText=%s,\n' % quote_python(self.SellerWebaddressText).encode(ExternalEncoding))
         if self.InvoiceSenderAddress is not None:
+            self.validate_genericStringValue0_35(self.InvoiceSenderAddress)
             showIndent(outfile, level)
             outfile.write('InvoiceSenderAddress=%s,\n' % quote_python(self.InvoiceSenderAddress).encode(ExternalEncoding))
         if self.InvoiceSenderIntermediatorAddress is not None:
+            self.validate_genericNMtokenValue8_11(self.InvoiceSenderIntermediatorAddress)
             showIndent(outfile, level)
             outfile.write('InvoiceSenderIntermediatorAddress=%s,\n' % quote_python(self.InvoiceSenderIntermediatorAddress).encode(ExternalEncoding))
         if self.NewInvoiceSenderAddress is not None:
+            self.validate_genericStringValue0_35(self.NewInvoiceSenderAddress)
             showIndent(outfile, level)
             outfile.write('NewInvoiceSenderAddress=%s,\n' % quote_python(self.NewInvoiceSenderAddress).encode(ExternalEncoding))
         if self.NewInvoiceSenderIntermediatorAddress is not None:
+            self.validate_genericNMtokenValue8_11(self.NewInvoiceSenderIntermediatorAddress)
             showIndent(outfile, level)
             outfile.write('NewInvoiceSenderIntermediatorAddress=%s,\n' % quote_python(self.NewInvoiceSenderIntermediatorAddress).encode(ExternalEncoding))
     def build(self, node):
@@ -2896,6 +2980,10 @@ def factory(*args_, **kwargs_):
     factory = staticmethod(factory)
     def get_valueOf_(self): return self.valueOf_
     def set_valueOf_(self, valueOf_): self.valueOf_ = valueOf_
+    def validate_valueOf_value(self, value):
+        if ( value.__len__() > 35 ):
+            raise_value_error( value.__len__(), 'Expected value less than 35 characters' )
+        return value
     def hasContent_(self):
         if (
             self.valueOf_ or
@@ -2911,6 +2999,7 @@ def export(self, outfile, level, namespace_='', name_='SellerInvoiceTypeTextType
             eol_ = ''
         if self.original_tagname_ is not None:
             name_ = self.original_tagname_
+        self.validate_valueOf_value(self.valueOf_) # validate valueOf_ 
         showIndent(outfile, level, pretty_print)
         outfile.write('<%s%s%s' % (namespace_, name_, namespacedef_ and ' ' + namespacedef_ or '', ))
         already_processed = set()

finvoice/sender/senderinfosubs.py

@@ -21,7 +21,7 @@
 
 import sys
 
-import finvoice as supermod
+import finvoice.sender.senderinfo as supermod
 
 etree_ = None
 Verbose_import_ = False

samples/senderinfo.py

@@ -112,7 +112,6 @@
 reload( sys )
 
 sys.setdefaultencoding( 'iso8859-15' )
-sys.path.append( './' )
 
 from finvoice.sender.senderinfo import ExternalEncoding
 from finvoice.sender.senderinfo import FinvoiceSenderInfo