[kupfer/maint: 340/341] py26: plugin.rhythmbox_support: default track number 0

[Ulrik Sverdrup <usverdrup src gnome org>]

commit c801e372b769d8b23c1620b49c72f57c0a8e2c4c
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Wed Nov 4 03:32:21 2009 +0100

    py26: plugin.rhythmbox_support: default track number 0
    
    /home/ulrik/pt/proj/kupfer/kupfer/plugin/rhythmbox_support.py:56:
    DeprecationWarning: comparing unequal types not supported in 3.x
      album.sort(key=get_track_number)

 kupfer/plugin/rhythmbox_support.py |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/kupfer/plugin/rhythmbox_support.py b/kupfer/plugin/rhythmbox_support.py
index 0b993ce..0c9620d 100644
--- a/kupfer/plugin/rhythmbox_support.py
+++ b/kupfer/plugin/rhythmbox_support.py
@@ -58,12 +58,10 @@ def get_rhythmbox_songs(dbfile, typ="song", keys=NEEDED_KEYS):
 def sort_album(album):
 	"""Sort album in track order"""
 	def get_track_number(rec):
-		tnr = rec.get("track-number")
-		if not tnr: return None
 		try:
-			tnr = int(tnr)
-		except ValueError:
-			pass
+			tnr = int(rec["track-number"])
+		except (KeyError, ValueError):
+			tnr = 0
 		return tnr
 	album.sort(key=get_track_number)
 
@@ -80,12 +78,10 @@ def sort_album_order(songs):
 	['b', 'c', 'a']
 	"""
 	def get_album_order(rec):
-		tnr = rec.get("track-number")
-		if not tnr: return None
 		try:
-			tnr = int(tnr)
-		except ValueError:
-			pass
+			tnr = int(rec["track-number"])
+		except (KeyError, ValueError):
+			tnr = 0
 		return (rec["album"], tnr)
 	songs.sort(key=get_album_order)