From 31303d26e4909b4924a4d3463918f7ad809fe9b5 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 16 Apr 2012 11:45:48 -0400
Subject: [PATCH 1/2] CC-3651: tmp file does not copy to Pypo cache

-fixed
---
 python_apps/pypo/pypofile.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/python_apps/pypo/pypofile.py b/python_apps/pypo/pypofile.py
index 6fb25b0c9..271aa9e0a 100644
--- a/python_apps/pypo/pypofile.py
+++ b/python_apps/pypo/pypofile.py
@@ -74,7 +74,7 @@ class PypoFile(Thread):
         Get highest priority media_item in the queue. Currently the highest
         priority is decided by how close the start time is to "now".
         """
-        if schedule is None:
+        if schedule is None or len(schedule) == 0:
             return None
             
         sorted_keys = sorted(schedule.keys())
@@ -121,8 +121,10 @@ class PypoFile(Thread):
                     except Empty, e:
                         pass
                                 
+
                 media_item = self.get_highest_priority_media_item(self.media)
-                self.copy_file(media_item)
+                if media_item is not None:
+                    self.copy_file(media_item)
             except Exception, e:
                 import traceback
                 top = traceback.format_exc()

From a6c0a1d2d9b490b09186089970e42b3c54ab10b3 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin.konecny@gmail.com>
Date: Mon, 16 Apr 2012 12:04:35 -0400
Subject: [PATCH 2/2] -removed erroneous import

---
 airtime_mvc/application/models/Scheduler.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/airtime_mvc/application/models/Scheduler.php b/airtime_mvc/application/models/Scheduler.php
index 8aa5a22e3..364e24cc6 100644
--- a/airtime_mvc/application/models/Scheduler.php
+++ b/airtime_mvc/application/models/Scheduler.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'Log.php';
-
 class Application_Model_Scheduler {
 
     private $con;
@@ -663,4 +661,4 @@ class Application_Model_Scheduler {
     }
 }
 
-class OutDatedScheduleException extends Exception {}
\ No newline at end of file
+class OutDatedScheduleException extends Exception {}