ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2427 from FinnStutzenstein/Issue2424

Browse Source 
Adding TypeError(fixes #2424)
This commit is contained in:
Norman Jäckel 2016-09-23 15:55:56 +02:00 committed by GitHub
commit 117489c57e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/agenda/migrations/0002_duration.py
View File

@ -13,7 +13,7 @@ def convert_duration(apps, schema_editor):
if is_int(duration): if is_int(duration):
# assuming that these are minutes # assuming that these are minutes
item.duration_tmp = int(duration) item.duration_tmp = int(duration)
else: elif isinstance(duration, str):
split = duration.split(':') split = duration.split(':')
# assuming format (h)h:(m)m # assuming format (h)h:(m)m
if len(split) == 2 and is_int(split[0]) and is_int(split[1]): if len(split) == 2 and is_int(split[0]) and is_int(split[1]):
@ -25,7 +25,7 @@ def convert_duration(apps, schema_editor):
def is_int(s): def is_int(s):
try: try:
int(s) int(s)
except ValueError: except (ValueError, TypeError):
return False return False
else: else:
return True return True