From 499d2b55e99fa2021166e38753e81df9d40dac1f Mon Sep 17 00:00:00 2001 From: mnandri Date: Sat, 19 Dec 2015 19:30:12 +0100 Subject: moving custom to_unicode to pixelated.support --- .../pixelated/adapter/mailstore/leap_mailstore.py | 2 +- service/pixelated/adapter/search/__init__.py | 4 +--- service/pixelated/resources/mails_resource.py | 2 +- service/pixelated/support/functional.py | 7 +++++++ service/pixelated/utils.py | 22 ---------------------- 5 files changed, 10 insertions(+), 27 deletions(-) delete mode 100755 service/pixelated/utils.py (limited to 'service/pixelated') diff --git a/service/pixelated/adapter/mailstore/leap_mailstore.py b/service/pixelated/adapter/mailstore/leap_mailstore.py index 2660a208..5637e763 100644 --- a/service/pixelated/adapter/mailstore/leap_mailstore.py +++ b/service/pixelated/adapter/mailstore/leap_mailstore.py @@ -26,7 +26,7 @@ from pixelated.adapter.mailstore.mailstore import MailStore, underscore_uuid from leap.mail.mail import Message from pixelated.adapter.model.mail import Mail, InputMail -from pixelated.utils import to_unicode +from pixelated.support.functional import to_unicode class AttachmentInfo(object): diff --git a/service/pixelated/adapter/search/__init__.py b/service/pixelated/adapter/search/__init__.py index 8d0b1f4e..1c06f66c 100644 --- a/service/pixelated/adapter/search/__init__.py +++ b/service/pixelated/adapter/search/__init__.py @@ -28,11 +28,9 @@ from whoosh.qparser import QueryParser from whoosh.qparser import MultifieldParser from whoosh.writing import AsyncWriter from whoosh import sorting -from pixelated.support.functional import unique +from pixelated.support.functional import unique, to_unicode import traceback -from pixelated.utils import to_unicode - class SearchEngine(object): DEFAULT_INDEX_HOME = os.path.join(os.environ['HOME'], '.leap') diff --git a/service/pixelated/resources/mails_resource.py b/service/pixelated/resources/mails_resource.py index 8874fe16..38786e11 100644 --- a/service/pixelated/resources/mails_resource.py +++ b/service/pixelated/resources/mails_resource.py @@ -9,7 +9,7 @@ from twisted.internet import defer from twisted.python.log import err from leap.common import events -from pixelated.utils import to_unicode +from pixelated.support.functional import to_unicode class MailsUnreadResource(Resource): diff --git a/service/pixelated/support/functional.py b/service/pixelated/support/functional.py index b496eb95..2e293625 100644 --- a/service/pixelated/support/functional.py +++ b/service/pixelated/support/functional.py @@ -28,3 +28,10 @@ def unique(_list): def compact(_list): return [a for a in _list if a] + + +def to_unicode(text): + if text and not isinstance(text, unicode): + encoding = 'utf-8' + return unicode(text, encoding=encoding) + return text diff --git a/service/pixelated/utils.py b/service/pixelated/utils.py deleted file mode 100755 index 2e0f1f88..00000000 --- a/service/pixelated/utils.py +++ /dev/null @@ -1,22 +0,0 @@ -# -# Copyright (c) 2015 ThoughtWorks, Inc. -# -# Pixelated is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Pixelated is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Pixelated. If not, see . - - -def to_unicode(text): - if text and not isinstance(text, unicode): - encoding = 'utf-8' - return unicode(text, encoding=encoding) - return text -- cgit v1.2.3