From: Ed Bartosh Date: Mon, 30 May 2016 12:51:20 +0000 (+0300) Subject: toaster: use // operator instead of / X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c38441ed99b49dae8ef9613e320f0760853d6aa;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git toaster: use // operator instead of / Division operator works differently in Python 3. It results in float unlike in Python 2, where it results in int. Explicitly used "floor division" operator instead of 'division' operator. This should make the code to result in integer under both pythons. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index dd6466471de..25bc1dbe151 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -424,7 +424,7 @@ class Build(models.Model): tf = Task.objects.filter(build = self) tfc = tf.count() if tfc > 0: - completeper = tf.exclude(order__isnull=True).count()*100/tfc + completeper = tf.exclude(order__isnull=True).count()*100 // tfc else: completeper = 0 return completeper diff --git a/lib/toaster/toastergui/templatetags/projecttags.py b/lib/toaster/toastergui/templatetags/projecttags.py index 75f2261be8c..1d680365adc 100644 --- a/lib/toaster/toastergui/templatetags/projecttags.py +++ b/lib/toaster/toastergui/templatetags/projecttags.py @@ -90,7 +90,7 @@ def whitespace_space_filter(value, arg): def divide(value, arg): if int(arg) == 0: return -1 - return int(value) / int(arg) + return int(value) // int(arg) @register.filter def multiply(value, arg):