X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=chooser.py;h=f6a9a497d3cd6c1205e6e31e81cee340c7056247;hb=75b27cc68871343681f01e3f5b04cae84b1b7b2a;hp=47a2cb71a065c35010d3411bffb58e7e9a0d981b;hpb=4b1f3d8a8b278ca6d62f461ea80c8ea21080c301;p=kiosk.git

diff --git a/chooser.py b/chooser.py
index 47a2cb7..f6a9a49 100644
--- a/chooser.py
+++ b/chooser.py
@@ -18,14 +18,14 @@ class chooser(object):
         for page in pages:
             result = re.match(valid_filename, page)
             if result != None:
-                print('chooser: candidate page: "%s"' % page)
+                print(('chooser: candidate page: "%s"' % page))
                 if (result.group(3) != "none"):
                     freshness_requirement = int(result.group(3))
                     last_modified = int(os.path.getmtime(
                         os.path.join(constants.pages_dir, page)))
                     age = (now - last_modified)
                     if (age > freshness_requirement):
-                        print ('"%s" is too old.' % page)
+                        print(('"%s" is too old.' % page))
                         continue
                 filenames.append(page)
         return filenames
@@ -56,12 +56,12 @@ class weighted_random_chooser(chooser):
                 total_weight += weight
 
         if (total_weight <= 0):
-            raise(error("No valid candidate pages found!"))
+            raise error
 
         while True:
             pick = random.randrange(0, total_weight - 1)
             so_far = 0
-            for x in xrange(0, len(weights)):
+            for x in range(0, len(weights)):
                 so_far += weights[x]
                 if (so_far > pick and
                     self.pages[x] != self.last_choice):
@@ -95,7 +95,7 @@ class weighted_random_chooser_with_triggers(weighted_random_chooser):
 
         # First try to satisfy from the page queue
         if (len(self.page_queue) > 0):
-            print "Pulling page from queue"
+            print("Pulling page from queue")
             page = None
             priority = None
             for t in self.page_queue:
@@ -123,7 +123,7 @@ class rotating_chooser(chooser):
             self.pages = self.get_page_list()
 
         if len(self.pages) == 0:
-            raise(error("No pages!"))
+            raise error
 
         if (self.current >= len(self.pages)):
             self.current = 0