aboutsummaryrefslogtreecommitdiff
path: root/pydora
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2015-07-03 22:13:26 -0700
committerMike Crute <mcrute@gmail.com>2015-07-03 22:16:31 -0700
commitda8801e7a3b2b83a9dc30796c03fa10d66205c22 (patch)
treececb62121bc44b8c312f066ddc2eb89dffae6c45 /pydora
parentff26ea542eea7daefc3f173fc3dce812572f2302 (diff)
downloadpydora-da8801e7a3b2b83a9dc30796c03fa10d66205c22.tar.bz2
pydora-da8801e7a3b2b83a9dc30796c03fa10d66205c22.tar.xz
pydora-da8801e7a3b2b83a9dc30796c03fa10d66205c22.zip
Code cleanup
Diffstat (limited to 'pydora')
-rwxr-xr-xpydora/player.py6
-rw-r--r--pydora/utils.py4
2 files changed, 6 insertions, 4 deletions
diff --git a/pydora/player.py b/pydora/player.py
index f8ccd93..6553873 100755
--- a/pydora/player.py
+++ b/pydora/player.py
@@ -6,15 +6,17 @@ This is a very simple Pandora player that streams music from Pandora. It
6requires mpg123 to function. No songs are downloaded, they are streamed 6requires mpg123 to function. No songs are downloaded, they are streamed
7directly from Pandora's servers. 7directly from Pandora's servers.
8""" 8"""
9from __future__ import print_function
10
9import os 11import os
10import sys 12import sys
11 13
12from pandora import APIClient 14from pandora import APIClient
13from pydora.mpg123 import Player 15from .mpg123 import Player
14from .utils import Colors, Screen 16from .utils import Colors, Screen
15 17
16 18
17class PlayerApp: 19class PlayerApp(object):
18 20
19 CMD_MAP = { 21 CMD_MAP = {
20 'n': ('play next song', 'skip_song'), 22 'n': ('play next song', 'skip_song'),
diff --git a/pydora/utils.py b/pydora/utils.py
index 53cc89f..5027c55 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -12,7 +12,7 @@ def input(prompt):
12 return builtins.input(prompt) 12 return builtins.input(prompt)
13 13
14 14
15class Colors: 15class Colors(object):
16 16
17 def __wrap_with(code): 17 def __wrap_with(code):
18 @staticmethod 18 @staticmethod
@@ -32,7 +32,7 @@ class Colors:
32 white = __wrap_with('37') 32 white = __wrap_with('37')
33 33
34 34
35class Screen: 35class Screen(object):
36 36
37 @staticmethod 37 @staticmethod
38 def set_echo(enabled): 38 def set_echo(enabled):