Mercurial Hosting > traffic-intelligence
diff python/storage.py @ 665:15e244d2a1b5
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 | 455f9b93819c |
children | da1352b89d02 |
line wrap: on
line diff
--- a/python/storage.py Wed May 20 12:04:22 2015 +0200 +++ b/python/storage.py Wed May 20 13:57:47 2015 +0200 @@ -3,11 +3,10 @@ '''Various utilities to save and load data''' import utils, moving, events, indicators +from base import VideoFilenameAddable import sqlite3, logging -__metaclass__ = type - commentChar = '#' @@ -867,13 +866,6 @@ # Utils to read .ini type text files for configuration, meta data... ######################### -class VideoFilenameAddable: - 'Base class with the capability to attach a video filename' - - def setVideoFilename(self, videoFilename): - self.videoFilename = videoFilename - - class ProcessParameters(VideoFilenameAddable): '''Class for all parameters controlling data processing: input, method parameters, etc. for tracking, classification and safety @@ -929,7 +921,7 @@ if filename is not None: self.loadConfigFile(filename) -class SceneParameters: +class SceneParameters(object): def __init__(self, config, sectionName): from ConfigParser import NoOptionError from ast import literal_eval