Merge pull request #40 from RogueM/commit

additional import try/except clauses for examples

examples/dot3k/advanced/animations.py

@@ -4,6 +4,7 @@
 import datetime
 import math
 import time
+from sys import exit
 
 try:
     import psutil

examples/dot3k/basic/mouse.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import signal
+from sys import exit
 
 try:
     import uinput

examples/plugins/graph.py

@@ -3,6 +3,7 @@
 import struct
 import subprocess
 import time
+from sys import exit
 
 try:
     import psutil

examples/plugins/radio.py

@@ -2,8 +2,8 @@
 import re
 import socket
 import subprocess
-import sys
 import time
+from sys import version_info
 
 from dot3k.menu import MenuOption
 
@@ -169,7 +169,7 @@ def kill(self):
 
     def send(self, command):
         try:
-            if sys.version_info[0] >= 3:
+            if version_info[0] >= 3:
                 self.socket.send((command + "\n").encode('utf-8'))
             else:
                 self.socket.send(command + "\n")
@@ -179,7 +179,7 @@ def send(self, command):
     def get_current_stream(self):
         self.send("status")
         status = self.socket.recv(8192)
-        if sys.version_info[0] >= 3:
+        if version_info[0] >= 3:
             status = status.decode('utf-8')
         result = re.search('input:\ (.*)\ ', status)
         state = re.search('state\ (.*)\ ', status)
@@ -210,7 +210,7 @@ def start(self):
         if self.pid is None:
             try:
                 return_value = subprocess.check_output(['pidof', 'vlc'])
-                if sys.version_info[0] >= 3:
+                if version_info[0] >= 3:
                     self.pid = int(return_value.decode('utf-8').split(' ')[0])
                 else:
                     self.pid = int(return_value.decode('utf-8').split(' ')[0])

examples/plugins/volume.py

@@ -1,7 +1,7 @@
 import os
 import subprocess
-import sys
 import time
+from sys import version_info
 
 import dot3k.backlight
 from dot3k.menu import MenuIcon
@@ -80,7 +80,7 @@ def set_mode(self):
 
     def get_volume(self):
         actual_volume = subprocess.check_output("amixer get 'PCM' | awk '$0~/%/{print $4}' | tr -d '[]%'", shell=True)
-        if sys.version_info[0] >= 3:
+        if version_info[0] >= 3:
             return actual_volume.strip().decode('utf-8')
         else:
             return actual_volume.strip()

examples/plugins/wlan.py

@@ -4,6 +4,7 @@
 
 import subprocess
 import threading
+from sys import exit
 
 try:
     import wifi

examples/radio_utils/control

@@ -1,7 +1,13 @@
 #!/usr/bin/env python
+
 import socket
 import sys
-import ConfigParser
+
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
+
 
 config = ConfigParser.ConfigParser()
 config.read(['../dot3k.cfg', 'dot3k.cfg'])
@@ -31,4 +37,4 @@ if command is not None:
         sck.connect((host, port))
         sck.send(command + '\n')
     except socket.error:
-        exit('Unable to connect to server: ' + host + ':' + str(port))
+        sys.exit('Unable to connect to server: ' + host + ':' + str(port))

examples/radio_utils/playshoutcast

@@ -1,8 +1,10 @@
 #!/usr/bin/env python
+
 import socket
 import sys
 import urllib
 
+
 to_play = None
 host = '127.0.0.1'
 port = 9393
@@ -38,4 +40,4 @@ if to_play is not None:
         sck.send('add ' + to_play + '\n')
         sck.send('play\n')
     except socket.error:
-        exit('Unable to connect to server: ' + host + ':' + str(port))
+        sys.exit('Unable to connect to server: ' + host + ':' + str(port))

examples/radio_utils/playstream

@@ -1,7 +1,12 @@
 #!/usr/bin/env python
 import socket
 import sys
-import ConfigParser
+
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
+
 
 config = ConfigParser.ConfigParser()
 config.read(['../dot3k.cfg', 'dot3k.cfg'])
@@ -42,4 +47,4 @@ if to_play is not None:
         sck.send('add ' + to_play + '\n')
         sck.send('play\n')
     except socket.error:
-        exit('Unable to connect to server: ' + host + ':' + str(port))
+        sys.exit('Unable to connect to server: ' + host + ':' + str(port))

examples/radio_utils/podcast

@@ -1,10 +1,19 @@
 #!/usr/bin/env python
 
-import podcastparser
-import urllib
 import socket
 import sys
-import ConfigParser
+import urllib
+
+try:
+    import ConfigParser
+except ImportError:
+    import configparser as ConfigParser
+
+try:
+    import podcastparser
+except ImportError:
+    sys.exit("This script requires the podcastparser module\nInstall with: sudo pip install podcastparser")
+
 
 feedurl = "http://crankygamersuk.libsyn.com/rss"
 episode_idx = 0

examples/radio_utils/volume

@@ -1,2 +1,3 @@
 #!/usr/bin/env bash
+
 amixer sset 'PCM' $1%

examples/utils/usbkeyboard.py

@@ -1,7 +1,11 @@
 import threading
+from sys import exit
 
-import usb.core
-import usb.util
+try:
+    import usb.core
+    import usb.util
+except ImportError:
+    exit("This script requires the pyusb module\nInstall with: sudo pip install pyusb")
 
 
 class StoppableThread(threading.Thread):

packaging/makelog.sh

@@ -51,7 +51,7 @@ inform "pypi changelog generated"
 
 if [ -n $(grep version "$libdir/setup.py" &> /dev/null) ]; then
     inform "touched up version in setup.py"
-    sed -i "s/[0-9].[0-9].[0-9]/$version/" "$libdir/setup.py"
+    sed -i "s/'[0-9].[0-9].[0-9]'/'$version'/" "$libdir/setup.py"
 else
     warning "couldn't touch up version in setup, no match found"
 fi
@@ -69,10 +69,10 @@ fi
 
 for sibling in ${sibname[@]}; do
     if grep -e "__version__" "$libdir/$sibling.py" &> /dev/null; then
-        sed -i "s/__version__ = '[0-9].[0-9].[0-9]/__version__ = '$version/" "$libdir/$sibling.py"
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling.py"
         inform "touched up version in $sibling.py"
     elif grep -e "__version__" "$libdir/$sibling/__init__.py" &> /dev/null; then
-        sed -i "s/__version__ = '[0-9].[0-9].[0-9]/__version__ = '$version/" "$libdir/$sibling/__init__.py"
+        sed -i "s/__version__ = '[0-9].[0-9].[0-9]'/__version__ = '$version'/" "$libdir/$sibling/__init__.py"
         inform "touched up version in $sibling/__init__.py"
     elif [ "$versionwarn" == "yes" ]; then
         warning "couldn't touch up __version__ in $sibling, no match found"