diff --git a/modules/okc/backend.py b/modules/okc/backend.py index 011eab13..a1d94693 100644 --- a/modules/okc/backend.py +++ b/modules/okc/backend.py @@ -19,9 +19,7 @@ from __future__ import with_statement -import email import time -import re import datetime from html2text import unescape from dateutil import tz @@ -30,11 +28,9 @@ from dateutil.parser import parse as _parse_dt from weboob.capabilities.base import NotLoaded from weboob.capabilities.messages import ICapMessages, ICapMessagesPost, Message, Thread #from weboob.capabilities.dating import ICapDating, OptimizationNotFound, Event -from weboob.capabilities.contact import ICapContact, ContactPhoto, Query, QueryError +from weboob.capabilities.contact import ICapContact, ContactPhoto, Contact from weboob.tools.backend import BaseBackend, BackendConfig -from weboob.tools.browser import BrowserUnavailable -from weboob.tools.value import Value, ValuesDict, ValueBool, ValueBackendPassword -from weboob.tools.log import getLogger +from weboob.tools.value import Value, ValueBackendPassword from weboob.tools.misc import local2utc from .browser import OkCBrowser diff --git a/modules/okc/browser.py b/modules/okc/browser.py index 6f531d6d..cec6b72f 100644 --- a/modules/okc/browser.py +++ b/modules/okc/browser.py @@ -18,18 +18,7 @@ # along with weboob. If not, see . -import math -import re -import datetime -import random -import urllib -from htmlentitydefs import codepoint2name -try: - import json -except ImportError: - import simplejson as json - -from weboob.tools.browser import BaseBrowser, BrowserIncorrectPassword, BrowserUnavailable +from weboob.tools.browser import BaseBrowser from weboob.tools.ordereddict import OrderedDict from .pages import LoginPage, ThreadPage, MessagesPage, PostMessagePage, ProfilePage, PhotosPage @@ -145,7 +134,7 @@ class OkCBrowser(BaseBrowser): self.location(self.absurl('/messages?readmsg=true&threadid=%i&folder=1' % id)) # Find the peer username - mails = self.page.get_thread_mails(count) + mails = self.page.get_thread_mails(count) for mail in mails['messages']: if mail['id_from'] != self.get_my_name(): mails['member']['pseudo'] = mail['id_from'] diff --git a/modules/okc/pages.py b/modules/okc/pages.py index 57a7e0cd..e3a9500f 100644 --- a/modules/okc/pages.py +++ b/modules/okc/pages.py @@ -18,9 +18,8 @@ # along with weboob. If not, see . -from weboob.tools.browser import BasePage, BrokenPageError +from weboob.tools.browser import BasePage from weboob.tools.ordereddict import OrderedDict -from weboob.tools.misc import html2text from weboob.capabilities.contact import ProfileNode class LoginPage(BasePage):