Mercurial > code > home > repos > light9

changeset 1244:5ef8d7c3820c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove another workaround for the graph.items bug Ignore-this: 34a2c6ad185fd6fb1b204af5a4f0fc67
author Drew Perttula <drewp@bigasterisk.com>
date Sat, 13 Jun 2015 01:29:23 +0000
parents 73efcda34af2
children 8480fb25239d
files light9/ascoltami/playlist.py
diffstat 1 files changed, 2 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/light9/ascoltami/playlist.py	Fri Jun 12 10:03:14 2015 +0000
+++ b/light9/ascoltami/playlist.py	Sat Jun 13 01:29:23 2015 +0000
@@ -1,6 +1,5 @@
-from light9.showconfig import getSongsFromShow, songOnDisk
+from light9.showconfig import songOnDisk
 from light9.namespaces import L9
-from rdflib import URIRef
 
 class NoSuchSong(ValueError):
     """Raised when a song is requested that doesn't exist (e.g. one
@@ -9,29 +8,7 @@
 class Playlist(object):
     def __init__(self, graph, playlistUri):
         self.graph = graph
-
-        # this should be fixed to share with getSongsFromShow. See note in that one for why I had to stop using graph.items
-        self.songs = [
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song1"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song2"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song3"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song4"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song5"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song6"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song7"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song8"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song9"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song10"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song11"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song12"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song13"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song14"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song15"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song16"),
-            URIRef("http://light9.bigasterisk.com/show/dance2014/song17"),
-        ]
-        # probably fixed with the patch in https://github.com/RDFLib/rdflib/issues/305
-        #self.songs = list(graph.items(playlistUri))
+        self.songs = list(graph.items(playlistUri))
         
     def nextSong(self, currentSong):
         """Returns the next song in the playlist or raises NoSuchSong if