aboutsummaryrefslogtreecommitdiffstats
path: root/transmission-remote-cli
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-12-18 00:59:25 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-12-18 00:59:25 +0000
commit4e2e5a455e50ebb250cc54e6d4e8b756db40a201 (patch)
tree8021d19e98ad22b9c8f6cd93d391614e004fec1e /transmission-remote-cli
parent2edcc8146aac796b68b029bf0533d44a6501cd42 (diff)
parent0d5ec069daad84f047095c3bdd7bea27e9ed1e81 (diff)
downloadtransmission-remote-cli-4e2e5a455e50ebb250cc54e6d4e8b756db40a201.tar.gz
Merge tag 'upstream/1.4.6'
Upstream version 1.4.6
Diffstat (limited to 'transmission-remote-cli')
-rwxr-xr-xtransmission-remote-cli17
1 files changed, 12 insertions, 5 deletions
diff --git a/transmission-remote-cli b/transmission-remote-cli
index 668faff..d874a48 100755
--- a/transmission-remote-cli
+++ b/transmission-remote-cli
@@ -16,10 +16,10 @@
# http://www.gnu.org/licenses/gpl-3.0.txt #
########################################################################
-VERSION = '1.4.5'
+VERSION = '1.4.6'
TRNSM_VERSION_MIN = '1.90'
-TRNSM_VERSION_MAX = '2.73'
+TRNSM_VERSION_MAX = '2.75'
RPC_VERSION_MIN = 8
RPC_VERSION_MAX = 14
@@ -155,9 +155,16 @@ class ColorManager:
# has something to do with how highlighting focus works.)
bg_name = pair.split(',')[1].split(':')[1].upper()
fg_name = pair.split(',')[0].split(':')[1].upper()
- return { 'id': len(self.config.keys()) + 1,
- 'bg': eval('curses.COLOR_' + bg_name),
- 'fg': eval('curses.COLOR_' + fg_name) }
+ color_pair = { 'id': len(self.config.keys()) + 1 }
+ try:
+ color_pair['bg'] = eval('curses.COLOR_' + bg_name)
+ except AttributeError:
+ color_pair['bg'] = -1
+ try:
+ color_pair['fg'] = eval('curses.COLOR_' + fg_name)
+ except AttributeError:
+ color_pair['fg'] = -1
+ return color_pair
def id(self, name): return self.config[name]['id']