diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-13 17:04:49 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-13 17:04:49 +0000 |
| commit | 89bfd5358e1490eb4b17d8197a30648d085d8042 (patch) | |
| tree | 9055fd908cbeaf9b32ab406b234eeb31c93225c3 | |
| parent | 8ca8c3fb2233a4d17443f9a8ed56ea3360943d21 (diff) | |
vcard.prettyPrint() prints to stdout, and doesn't return a string.
pep-8 formatting fixes
svn path=/trunk/; revision=4860
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-rcynic.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py index 439a091a..16083f27 100644 --- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py +++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py @@ -98,7 +98,6 @@ def rcynic_roa(roa, obj): def rcynic_gbr(gbr, obj): vcard = vobject.readOne(gbr.vcard) - logger.debug(vcard.prettyPrint()) obj.full_name = vcard.fn.value if hasattr(vcard, 'fn') else None obj.email_address = vcard.email.value if hasattr(vcard, 'email') else None obj.telephone = vcard.tel.value if hasattr(vcard, 'tel') else None @@ -130,14 +129,14 @@ def save_statuses(inst, statuses): @transaction.commit_on_success def process_cache(root, xml_file): dispatch = { - 'rcynic_certificate': rcynic_cert, - 'rcynic_roa': rcynic_roa, - 'rcynic_ghostbuster': rcynic_gbr + 'rcynic_certificate': rcynic_cert, + 'rcynic_roa': rcynic_roa, + 'rcynic_ghostbuster': rcynic_gbr } model_class = { - 'rcynic_certificate': models.Cert, - 'rcynic_roa': models.ROA, - 'rcynic_ghostbuster': models.Ghostbuster + 'rcynic_certificate': models.Cert, + 'rcynic_roa': models.ROA, + 'rcynic_ghostbuster': models.Ghostbuster } last_uri = None @@ -176,7 +175,8 @@ def process_cache(root, xml_file): try: obj = vs.obj # causes object to be lazily loaded except rpki.POW._der.DerError, e: - logger.warning('Caught %s while processing %s: %s' % (type(e), vs.filename, e)) + logger.warning('Caught %s while processing %s: %s' % ( + type(e), vs.filename, e)) continue inst.not_before = obj.notBefore.to_sql() |