From c122e6f9cc58770caf385e14ff9dbf061b87aac8 Mon Sep 17 00:00:00 2001 From: Florent Date: Wed, 9 Jul 2014 11:20:56 +0200 Subject: [PATCH] Do not import/export dates utils in misc --- modules/aum/backend.py | 3 ++- modules/dlfp/pages/news.py | 2 +- modules/okc/backend.py | 2 +- modules/okc/pages.py | 4 ++-- modules/phpbb/tools.py | 2 +- weboob/tools/misc.py | 3 +-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/aum/backend.py b/modules/aum/backend.py index 3777d2c1..be3a1c8a 100644 --- a/modules/aum/backend.py +++ b/modules/aum/backend.py @@ -37,7 +37,8 @@ from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.browser import BrowserUnavailable, BrowserHTTPNotFound from weboob.tools.value import Value, ValuesDict, ValueBool, ValueBackendPassword from weboob.tools.log import getLogger -from weboob.tools.misc import local2utc, to_unicode +from weboob.tools.date import local2utc +from weboob.tools.misc import to_unicode from .contact import Contact from .captcha import CaptchaError diff --git a/modules/dlfp/pages/news.py b/modules/dlfp/pages/news.py index da3e88b1..a10145a3 100644 --- a/modules/dlfp/pages/news.py +++ b/modules/dlfp/pages/news.py @@ -21,7 +21,7 @@ from datetime import datetime from weboob.tools.browser import BrokenPageError -from weboob.tools.misc import local2utc +from weboob.tools.date import local2utc from ..tools import url2id from .index import DLFPPage diff --git a/modules/okc/backend.py b/modules/okc/backend.py index 0cca7eb4..2c65a34b 100644 --- a/modules/okc/backend.py +++ b/modules/okc/backend.py @@ -29,7 +29,7 @@ from weboob.capabilities.dating import CapDating, OptimizationNotFound, Event from weboob.capabilities.contact import CapContact, ContactPhoto, Contact, Query, QueryError from weboob.tools.backend import BaseBackend, BackendConfig from weboob.tools.value import Value, ValueBackendPassword -from weboob.tools.misc import local2utc +from weboob.tools.date import local2utc from .browser import OkCBrowser from .optim.profiles_walker import ProfilesWalker diff --git a/modules/okc/pages.py b/modules/okc/pages.py index 52436032..ac17e6e9 100644 --- a/modules/okc/pages.py +++ b/modules/okc/pages.py @@ -23,8 +23,8 @@ from datetime import datetime from weboob.tools.browser import BasePage from weboob.tools.ordereddict import OrderedDict from weboob.capabilities.contact import ProfileNode -from weboob.tools.misc import local2utc, html2text - +from weboob.tools.misc import html2text +from weboob.tools.date import local2utc class LoginPage(BasePage): def login(self, username, password): diff --git a/modules/phpbb/tools.py b/modules/phpbb/tools.py index f384dbf4..0599a507 100644 --- a/modules/phpbb/tools.py +++ b/modules/phpbb/tools.py @@ -21,7 +21,7 @@ from dateutil.parser import parse as _parse_dt from urlparse import urlsplit, parse_qs -from weboob.tools.misc import local2utc +from weboob.tools.date import local2utc def url2id(url, nopost=False): diff --git a/weboob/tools/misc.py b/weboob/tools/misc.py index a4ec6598..163e3d61 100644 --- a/weboob/tools/misc.py +++ b/weboob/tools/misc.py @@ -25,12 +25,11 @@ import sys import traceback import types # keep compatibility -from .date import local2utc, utc2local from .compat import unicode __all__ = ['get_backtrace', 'get_bytes_size', 'html2text', 'iter_fields', - 'local2utc', 'to_unicode', 'utc2local', 'limit'] + 'to_unicode', 'limit'] def get_backtrace(empty="Empty backtrace."):