From 3246e3d4f1baad9008be1e869fc5feb2f8c62dfc Mon Sep 17 00:00:00 2001
From: Markus Willman <mpewil@utu.fi>
Date: Fri, 23 Feb 2018 16:38:56 +0200
Subject: [PATCH] rename argument for truncateString, avoid collision with
internal names
---
contrib/src/web/database.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/contrib/src/web/database.py b/contrib/src/web/database.py
index f97da9c..a87f6de 100755
--- a/contrib/src/web/database.py
+++ b/contrib/src/web/database.py
@@ -11,12 +11,12 @@ from dateutil.tz import tzlocal
_database = PostgresqlDatabase('stop', user='stop', password='PT52lRecp4NBKQrZT9', host='database')
# Helper functions
-def truncateString(str, size):
- strLen = len(str)
- if size <= 3 or strLen <= 3:
- return str
+def truncateString(value, size):
+ valLen = len(value)
+ if size <= 3 or valLen <= 3:
+ return value
- return (str[:(size-3)] + '...') if strLen > size else str
+ return (value[:(size-3)] + '...') if valLen > size else value
# NOTE: most docker images run in UTC by default
def currentTime(format = None):
--
GitLab