diff options
author | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
---|---|---|
committer | Valérie-Emma Leroux <valerie-emma.leroux@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
commit | 655236dd5d04d6527184a58ef8622e75c73f8a65 (patch) | |
tree | f773b80964981c231c892ee5255b94285bc5620a /archaeological_operations/utils.py | |
parent | dc08e5f643562a6ecf3b208c1e2cd44e5350af3c (diff) | |
parent | a4f1766d2217b1a3bc4d1d17625d9d808eed7416 (diff) | |
download | Ishtar-655236dd5d04d6527184a58ef8622e75c73f8a65.tar.bz2 Ishtar-655236dd5d04d6527184a58ef8622e75c73f8a65.zip |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'archaeological_operations/utils.py')
-rw-r--r-- | archaeological_operations/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index a84ff44ae..40ca71c05 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -254,9 +254,9 @@ def parse_year(value): value = parse_string(value) try: yr = int(value) - except: + except ValueError: return None - if yr < 1900 or yr > 2100: + if yr < 1600 or yr > 2100: return None return yr |