From 6821563bdba21f01386887c1dff951033684ce71 Mon Sep 17 00:00:00 2001
From: Joe Shochet <shochet@gmail.com>
Date: Fri, 10 Nov 2000 08:46:14 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/showbase/DirectNotify.py | 4 ++--
 direct/src/showbase/EventManager.py | 2 +-
 direct/src/showbase/Logger.py       | 2 +-
 direct/src/showbase/Task.py         | 6 +++++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/direct/src/showbase/DirectNotify.py b/direct/src/showbase/DirectNotify.py
index 24d4f77bb3..2c18c3dbba 100644
--- a/direct/src/showbase/DirectNotify.py
+++ b/direct/src/showbase/DirectNotify.py
@@ -43,12 +43,12 @@ class DirectNotify:
             self.__categories[categoryName] = category
             return(1)
 
-    def newCategory(self, categoryName):
+    def newCategory(self, categoryName, logger=None):
         """newCategory(self, string)
         Make a new notify category named categoryName. Return new category
         if no such category exists, else return existing category"""
         if (not self.__categories.has_key(categoryName)):
-            self.__categories[categoryName] = Notifier.Notifier(categoryName)
+            self.__categories[categoryName] = Notifier.Notifier(categoryName, logger)
         else:
             print "Warning: DirectNotify: category '%s' already exists" % \
                   (categoryName)
diff --git a/direct/src/showbase/EventManager.py b/direct/src/showbase/EventManager.py
index a58c047890..f254c03be0 100644
--- a/direct/src/showbase/EventManager.py
+++ b/direct/src/showbase/EventManager.py
@@ -1,5 +1,5 @@
 
-from PandaModules import *
+from libpandaexpressModules import *
 from MessengerGlobal import *
 from TaskManagerGlobal import *
 from DirectNotifyGlobal import *
diff --git a/direct/src/showbase/Logger.py b/direct/src/showbase/Logger.py
index 817404c1f7..a84ca6eff0 100644
--- a/direct/src/showbase/Logger.py
+++ b/direct/src/showbase/Logger.py
@@ -57,7 +57,7 @@ class Logger:
         Open a file for logging error/warning messages"""
         self.resetStartTime()
         t = time.localtime(self.__startTime)
-        st = time.strftime("%m.%d.%Y-%H:%M:%S", t)
+        st = time.strftime("%m-%d-%Y-%H-%M-%S", t)
         logFileName = self.__logFileName + "." + st
         self.__logFile = open(logFileName, "w")
 
diff --git a/direct/src/showbase/Task.py b/direct/src/showbase/Task.py
index a1b86582ba..9f9eeba11f 100644
--- a/direct/src/showbase/Task.py
+++ b/direct/src/showbase/Task.py
@@ -1,5 +1,5 @@
 
-from PandaModules import *
+from libpandaexpressModules import *
 from DirectNotify import *
 from PythonUtil import *
 
@@ -239,7 +239,11 @@ class TaskManager:
         for task in self.taskList:
             task.setCurrentTimeFrame(self.currentTime, self.currentFrame)
             # Run the task and check the return value
+            if task.name == 'test':
+                print 'before task'
             ret = task(task)
+            if task.name == 'test':
+                print 'after  task'
             if (ret == cont):
                 continue
             elif (ret == done):