Wiking branch, master, updated. da56e5da91ee4fcf1112bde5ba78ec9380761d41

[Tomas Cerha]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Wiking".

The branch, master has been updated
       via  da56e5da91ee4fcf1112bde5ba78ec9380761d41 (commit)
      from  9b138ed33561f7205e76ec7ac6287e119de46df5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit da56e5da91ee4fcf1112bde5ba78ec9380761d41
Author: Tomas Cerha <cerha at brailcom.org>
Date:   Wed Jun 15 09:49:47 2011 +0200

    Use the new field inheritance method instead of the deprecated one

-----------------------------------------------------------------------

Summary of changes:
 lib/wiking/cms/certificates.py |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/wiking/cms/certificates.py b/lib/wiking/cms/certificates.py
index 41fb154..e73d05e 100644
--- a/lib/wiking/cms/certificates.py
+++ b/lib/wiking/cms/certificates.py
@@ -320,12 +320,11 @@ class CertificateRequest(UserCertificates):
             self._serial_number_counter = pd.DBCounterDefault('certificate_serial_number', dbconnection)
             
         def fields(self):
-            fields = pp.Fields(UserCertificates.Spec.fields(self))
-            overridden = [Field(inherit=fields['file'], descr=_("Upload a PEM file containing the certificate request")),
-                          Field(inherit=fields['purpose'], default=self._PURPOSE_AUTHENTICATION)]
+            overridden = (Field('file', descr=_("Upload a PEM file containing the certificate request")),
+                          Field('purpose', default=self._PURPOSE_AUTHENTICATION))
             # We add some fields to propagate last form values to the new request
-            extra = [Field('regcode', type=pytis.data.String(), virtual=True)]
-            return fields.fields(override=overridden) + extra            
+            extra = (Field('regcode', type=pytis.data.String(), virtual=True),)
+            return self._inherited_fields(CertificateRequest, override=overridden) + extra
 
         def _certificate_computation(self, buffer):
             serial_number = self._serial_number_counter.next()


hooks/post-receive
-- 
Wiking