Mercurial > farol > farol
comparison farol/controller.py @ 129:d2588d88d47a
Move parseVersion flashing one level higher
| author | Benoît Allard <benoit.allard@greenbone.net> |
|---|---|
| date | Fri, 24 Oct 2014 10:52:04 +0200 |
| parents | d49c1ee6bc07 |
| children | 5b47af23547f |
comparison
equal
deleted
inserted
replaced
| 128:79abdecb2d0b | 129:d2588d88d47a |
|---|---|
| 33 try: | 33 try: |
| 34 from datetime import timezone | 34 from datetime import timezone |
| 35 except ImportError: | 35 except ImportError: |
| 36 from farolluz.py2 import FixedTimeZone as timezone | 36 from farolluz.py2 import FixedTimeZone as timezone |
| 37 | 37 |
| 38 from flask import request | 38 from flask import request, flash |
| 39 | 39 |
| 40 from farolluz.cvrf import CVRFNote, CVRFReference, CVRFAcknowledgment | 40 from farolluz.cvrf import CVRFNote, CVRFReference, CVRFAcknowledgment |
| 41 from farolluz.parsers.cvrf import parseDate as parseXMLDate, parseVersion as parseXMLVersion | 41 from farolluz.parsers.cvrf import parseDate as parseXMLDate, parseVersion as parseXMLVersion |
| 42 | 42 |
| 43 def split_fields(field, separator=','): | 43 def split_fields(field, separator=','): |
| 93 tzinfo=timezone(timedelta(hours=0, minutes=0))) | 93 tzinfo=timezone(timedelta(hours=0, minutes=0))) |
| 94 | 94 |
| 95 def parseVersion(string): | 95 def parseVersion(string): |
| 96 """ An extended version, one that doesn't throw exceptions """ | 96 """ An extended version, one that doesn't throw exceptions """ |
| 97 try: return parseXMLVersion(string) | 97 try: return parseXMLVersion(string) |
| 98 except ValueError: return None | 98 except ValueError: |
| 99 flash('Cannot parse Version string: "%s"' % string) | |
| 100 return None |