From 5b021f34be01597574bf6b6e9890dc268edf651d Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Wed, 6 Aug 2014 23:10:29 +0200 Subject: [PATCH] Import fixes --- mopidy_touchscreen/library_screen.py | 1 - mopidy_touchscreen/list_view.py | 1 - mopidy_touchscreen/main_screen.py | 7 +++---- mopidy_touchscreen/screen_manager.py | 5 ++--- mopidy_touchscreen/screen_objects.py | 1 - mopidy_touchscreen/touch_manager.py | 1 - mopidy_touchscreen/touch_screen.py | 7 +++---- mopidy_touchscreen/touch_screen_backend.py | 4 +--- tests/test_extension.py | 3 ++- 9 files changed, 11 insertions(+), 19 deletions(-) diff --git a/mopidy_touchscreen/library_screen.py b/mopidy_touchscreen/library_screen.py index e2ba9cd..422f753 100644 --- a/mopidy_touchscreen/library_screen.py +++ b/mopidy_touchscreen/library_screen.py @@ -5,7 +5,6 @@ import mopidy.models from .list_view import ListView from .touch_manager import TouchManager - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/list_view.py b/mopidy_touchscreen/list_view.py index f5df341..d2f5b1d 100644 --- a/mopidy_touchscreen/list_view.py +++ b/mopidy_touchscreen/list_view.py @@ -3,7 +3,6 @@ import logging from .screen_objects import ScreenObjectsManager, ScrollBar, TouchAndTextItem from .touch_manager import TouchManager - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py index ef428ca..6f123f0 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/main_screen.py @@ -2,18 +2,17 @@ import hashlib import json import logging import os -from threading import Thread import time import urllib import urllib2 +from threading import Thread import pygame -from .screen_objects import Progressbar, ScreenObjectsManager, \ - TextItem, TouchAndTextItem +from .screen_objects import (Progressbar, ScreenObjectsManager, TextItem, + TouchAndTextItem) from .touch_manager import TouchManager - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index 19ded3b..05cea25 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,10 +1,10 @@ import logging import traceback -import pygame -from pkg_resources import resource_filename, Requirement import mopidy import mopidy.core +import pygame +from pkg_resources import Requirement, resource_filename from .dynamic_background import DynamicBackground from .library_screen import LibraryScreen @@ -15,7 +15,6 @@ from .screen_objects import Progressbar, ScreenObjectsManager, TouchAndTextItem from .touch_manager import TouchManager from .tracklist import Tracklist - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/screen_objects.py index 6858e7a..5bd7e0c 100644 --- a/mopidy_touchscreen/screen_objects.py +++ b/mopidy_touchscreen/screen_objects.py @@ -3,7 +3,6 @@ import math import pygame - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/touch_manager.py b/mopidy_touchscreen/touch_manager.py index e6319bd..0a8d085 100644 --- a/mopidy_touchscreen/touch_manager.py +++ b/mopidy_touchscreen/touch_manager.py @@ -3,7 +3,6 @@ import time import pygame - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py index d4cb65b..a185bd9 100644 --- a/mopidy_touchscreen/touch_screen.py +++ b/mopidy_touchscreen/touch_screen.py @@ -1,14 +1,13 @@ import logging -from threading import Thread import traceback -import pykka +from threading import Thread -from mopidy import core import pygame +import pykka +from mopidy import core from .screen_manager import ScreenManager - logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/touch_screen_backend.py b/mopidy_touchscreen/touch_screen_backend.py index faafbe1..c58e2e9 100644 --- a/mopidy_touchscreen/touch_screen_backend.py +++ b/mopidy_touchscreen/touch_screen_backend.py @@ -1,10 +1,8 @@ import logging + import pykka - from mopidy import backend - - logger = logging.getLogger(__name__) diff --git a/tests/test_extension.py b/tests/test_extension.py index d8eb118..c52e8fc 100644 --- a/tests/test_extension.py +++ b/tests/test_extension.py @@ -2,8 +2,9 @@ import unittest - from mopidy_touchscreen import Extension + + # ,touch_screen as frontend_lib