Python 3 compatabilityrelease-0.2.0

2 files changed, 11 insertions, 8 deletions

diff --git a/pydora/mpg123.py b/pydora/mpg123.py
index bb2e76a..12bc109 100644
--- a/pydora/mpg123.py
+++ b/pydora/mpg123.py
@@ -89,7 +89,7 @@ class Player(object):
     def _send_cmd(self, cmd):
         """Write command to remote mpg123 process
         """
-        self._process.stdin.write("{}\n".format(cmd))
+        self._process.stdin.write("{}\n".format(cmd).encode("utf-8"))
         self._process.stdin.flush()
 
     def stop(self):
@@ -105,7 +105,7 @@ class Player(object):
     def _player_stopped(self, value):
         """Determine if player has stopped
         """
-        return value.startswith("@P") and value[3] == "0"
+        return value.startswith(b"@P") and value.decode('utf-8')[3] == "0"
 
     def play(self, song):
         """Play a new song from a Pandora model
diff --git a/pydora/utils.py b/pydora/utils.py
index 7a86d7a..53cc89f 100644
--- a/pydora/utils.py
+++ b/pydora/utils.py
@@ -4,6 +4,14 @@ import sys
 import termios
 
 
+def input(prompt):
+    try:
+        return raw_input(prompt)
+    except NameError:
+        import builtins
+        return builtins.input(prompt)
+
+
 class Colors:
 
     def __wrap_with(code):
@@ -60,14 +68,9 @@ class Screen:
         Will keep trying till the user enters an interger or until they ^C the
         program.
         """
-        try:
-            raw_input
-        except NameError:
-            raw_input = input
-
         while True:
             try:
-                return int(raw_input(prompt).strip())
+                return int(input(prompt).strip())
             except ValueError:
                 print(Colors.red('Invaid Input!'))