From eff70cf055d8f5be63c82b32d2bbe48cfcbe0386 Mon Sep 17 00:00:00 2001
From: William McBrine <wmcbrine@gmail.com>
Date: Sun, 6 Jul 2008 04:49:57 -0400
Subject: [PATCH] Simpler seek/duration/encoding assignment.

---
 plugins/music/music.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/plugins/music/music.py b/plugins/music/music.py
index c3f222a..6ad9233 100644
--- a/plugins/music/music.py
+++ b/plugins/music/music.py
@@ -66,10 +66,7 @@ class EncodeUnicode(Filter):
     def filter(self, val, **kw):
         """Encode Unicode strings, by default in UTF-8"""
 
-        if kw.has_key('encoding'):
-            encoding = kw['encoding']
-        else:
-            encoding='utf8'
+        encoding = kw.get('encoding', 'utf8')
                             
         if type(val) == type(u''):
             filtered = val.encode(encoding)
@@ -98,10 +95,8 @@ class Music(Plugin):
             path = handler.path
         else:
             opts = cgi.parse_qs(query)
-            if 'Seek' in opts:
-                seek = int(opts['Seek'][0])
-            if 'Duration' in opts:
-                duration = int(opts['Duration'][0])
+            seek = int(opts.get('Seek', [0])[0])
+            duration = int(opts.get('Duration', [0])[0])
 
         fname = os.path.join(os.path.normpath(container['path']),
                              unquote(path)[len(name) + 2:])
-- 
2.11.4.GIT