From 5da03f005f48cfb4fc8c7657f02f505286d45b8f Mon Sep 17 00:00:00 2001 From: RogueM Date: Tue, 8 Nov 2016 23:29:14 +0000 Subject: [PATCH 1/2] additional import try/except clauses --- examples/dot3k/advanced/animations.py | 1 + examples/dot3k/basic/mouse.py | 1 + examples/plugins/graph.py | 1 + examples/plugins/radio.py | 8 ++++---- examples/plugins/volume.py | 4 ++-- examples/plugins/wlan.py | 1 + examples/radio_utils/control | 10 ++++++++-- examples/radio_utils/playshoutcast | 4 +++- examples/radio_utils/playstream | 9 +++++++-- examples/radio_utils/podcast | 15 ++++++++++++--- examples/radio_utils/volume | 1 + examples/utils/usbkeyboard.py | 8 ++++++-- 12 files changed, 47 insertions(+), 16 deletions(-) diff --git a/examples/dot3k/advanced/animations.py b/examples/dot3k/advanced/animations.py index eb96958..64a4b57 100755 --- a/examples/dot3k/advanced/animations.py +++ b/examples/dot3k/advanced/animations.py @@ -4,6 +4,7 @@ import datetime import math import time +from sys import exit try: import psutil diff --git a/examples/dot3k/basic/mouse.py b/examples/dot3k/basic/mouse.py index 371c3c8..16ba612 100755 --- a/examples/dot3k/basic/mouse.py +++ b/examples/dot3k/basic/mouse.py @@ -1,6 +1,7 @@ #!/usr/bin/env python import signal +from sys import exit try: import uinput diff --git a/examples/plugins/graph.py b/examples/plugins/graph.py index 042e90e..d6dcf56 100644 --- a/examples/plugins/graph.py +++ b/examples/plugins/graph.py @@ -3,6 +3,7 @@ import struct import subprocess import time +from sys import exit try: import psutil diff --git a/examples/plugins/radio.py b/examples/plugins/radio.py index 08ab686..e3a12be 100644 --- a/examples/plugins/radio.py +++ b/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]) diff --git a/examples/plugins/volume.py b/examples/plugins/volume.py index f36d6d1..07f0e5f 100644 --- a/examples/plugins/volume.py +++ b/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() diff --git a/examples/plugins/wlan.py b/examples/plugins/wlan.py index ea2f319..485f836 100644 --- a/examples/plugins/wlan.py +++ b/examples/plugins/wlan.py @@ -4,6 +4,7 @@ import subprocess import threading +from sys import exit try: import wifi diff --git a/examples/radio_utils/control b/examples/radio_utils/control index 2cb2d76..6893c1e 100755 --- a/examples/radio_utils/control +++ b/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)) diff --git a/examples/radio_utils/playshoutcast b/examples/radio_utils/playshoutcast index 7451afc..cc4abae 100755 --- a/examples/radio_utils/playshoutcast +++ b/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)) diff --git a/examples/radio_utils/playstream b/examples/radio_utils/playstream index e043f80..815e2b0 100755 --- a/examples/radio_utils/playstream +++ b/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)) diff --git a/examples/radio_utils/podcast b/examples/radio_utils/podcast index f725333..db2ce11 100755 --- a/examples/radio_utils/podcast +++ b/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 diff --git a/examples/radio_utils/volume b/examples/radio_utils/volume index c9b01d3..a65b9d8 100755 --- a/examples/radio_utils/volume +++ b/examples/radio_utils/volume @@ -1,2 +1,3 @@ #!/usr/bin/env bash + amixer sset 'PCM' $1% diff --git a/examples/utils/usbkeyboard.py b/examples/utils/usbkeyboard.py index 29bc4bf..91e024c 100644 --- a/examples/utils/usbkeyboard.py +++ b/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): From c84cf95d320a848cb3bdddd25b85475462c89c30 Mon Sep 17 00:00:00 2001 From: RogueM Date: Wed, 9 Nov 2016 01:01:58 +0000 Subject: [PATCH 2/2] fix for setup.py touch up --- packaging/makelog.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/makelog.sh b/packaging/makelog.sh index 6aa26b3..dfb2479 100755 --- a/packaging/makelog.sh +++ b/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"