Mercurial Hosting > traffic-intelligence

diff python/pavement.py @ 665:15e244d2a1b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug with circular import for VideoFilenameAddable, moved to base module
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 20 May 2015 13:57:47 +0200
parents 3058e00887bc
children 933670761a57
line wrap: on
line diff
--- a/python/pavement.py	Wed May 20 12:04:22 2015 +0200
+++ b/python/pavement.py	Wed May 20 13:57:47 2015 +0200
@@ -5,7 +5,6 @@
 
 import numpy as np
 
-__metaclass__ = type
 
 paintTypes = {0: "Non-existant",
               1: "Eau",
@@ -235,7 +234,7 @@
 
     return (nbre_jours_T_negatif,nbre_jours_gel_degel, deltas_T, nbre_jours_gel_consecutifs, ecart_type_T)
 
-class RTSS:
+class RTSS(object):
     '''class for data related to a RTSS:
     - agregating pavement marking measurements
     - RTSS characteristics from FMR: pavement type, age, AADT, truck AADT
@@ -253,7 +252,7 @@
         self.name = name
         self.data = data
 
-class MarkingTest:
+class MarkingTest(object):
     '''class for a test site for a given product
 
     including the series of measurements over the years'''