From b9d4a5881968489f58ffc083a71ad61659e913b1 Mon Sep 17 00:00:00 2001 From: 9and3r <9and3r@gmail.com> Date: Mon, 4 Aug 2014 14:39:45 +0200 Subject: [PATCH] Code cleanup --- mopidy_touchscreen/list_view.py | 2 +- mopidy_touchscreen/main_screen.py | 10 +++++----- mopidy_touchscreen/screen_manager.py | 14 +++++++------- mopidy_touchscreen/screen_objects.py | 2 ++ mopidy_touchscreen/touch_screen.py | 4 ++-- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mopidy_touchscreen/list_view.py b/mopidy_touchscreen/list_view.py index 7c704a9..3d7c375 100644 --- a/mopidy_touchscreen/list_view.py +++ b/mopidy_touchscreen/list_view.py @@ -1,7 +1,7 @@ import logging -from .touch_manager import TouchManager from .screen_objects import ScreenObjectsManager, TouchAndTextItem, ScrollBar +from .touch_manager import TouchManager logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/main_screen.py b/mopidy_touchscreen/main_screen.py index 54cdac9..b1a76ea 100644 --- a/mopidy_touchscreen/main_screen.py +++ b/mopidy_touchscreen/main_screen.py @@ -1,17 +1,17 @@ -import time +import hashlib +import json +import logging import os from threading import Thread +import time import urllib import urllib2 -import json -import hashlib -import logging import pygame -from .touch_manager import TouchManager from .screen_objects import ScreenObjectsManager, Progressbar, \ TouchAndTextItem, TextItem +from .touch_manager import TouchManager logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_manager.py b/mopidy_touchscreen/screen_manager.py index 9ce5240..561123d 100644 --- a/mopidy_touchscreen/screen_manager.py +++ b/mopidy_touchscreen/screen_manager.py @@ -1,19 +1,19 @@ -import traceback import logging import mopidy from pkg_resources import Requirement, resource_filename +import traceback -import pygame import mopidy.core +import pygame -from .main_screen import MainScreen -from .touch_manager import TouchManager -from .screen_objects import ScreenObjectsManager, TouchAndTextItem, Progressbar -from .tracklist import Tracklist -from .playlist_screen import PlaylistScreen from .dynamic_background import DynamicBackground from .library_screen import LibraryScreen +from .main_screen import MainScreen from .menu_screen import MenuScreen +from .playlist_screen import PlaylistScreen +from .screen_objects import ScreenObjectsManager, TouchAndTextItem, Progressbar +from .tracklist import Tracklist +from .touch_manager import TouchManager logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/screen_objects.py b/mopidy_touchscreen/screen_objects.py index 46da2f7..6858e7a 100644 --- a/mopidy_touchscreen/screen_objects.py +++ b/mopidy_touchscreen/screen_objects.py @@ -1,7 +1,9 @@ import logging import math + import pygame + logger = logging.getLogger(__name__) diff --git a/mopidy_touchscreen/touch_screen.py b/mopidy_touchscreen/touch_screen.py index f38130b..fe5a3c0 100644 --- a/mopidy_touchscreen/touch_screen.py +++ b/mopidy_touchscreen/touch_screen.py @@ -1,7 +1,7 @@ -import pykka -import traceback import logging +import pykka from threading import Thread +import traceback import pygame