# HG changeset patch
# User Sascha L. Teichmann <teichmann@intevation.de>
# Date 1292409359 -3600
# Node ID d4ce02a33acdd285ac2e85821cfc5c581582a74d
# Parent  aa6c4aca2f8da54bc1f298c087aa334966eff58f
Minor fixes (logging, states)

diff -r aa6c4aca2f8d -r d4ce02a33acd ChangeLog
--- a/ChangeLog	Wed Dec 15 10:38:15 2010 +0100
+++ b/ChangeLog	Wed Dec 15 11:35:59 2010 +0100
@@ -1,3 +1,11 @@
+2010-12-15	Sascha L. Teichmann <sascha.teichmann@intevation.de>
+
+	Some minor fixes
+
+	* getan/config.py: Proper use of global logger.
+	* getan/resources.py: Removed needless import
+	* getan/states.py: Fixed state errors
+
 2010-12-15	Sascha L. Teichmann <sascha.teichmann@intevation.de>
 
 	Fix for #1624
diff -r aa6c4aca2f8d -r d4ce02a33acd getan/config.py
--- a/getan/config.py	Wed Dec 15 10:38:15 2010 +0100
+++ b/getan/config.py	Wed Dec 15 11:35:59 2010 +0100
@@ -19,6 +19,7 @@
 
 
 def setup_logging():
+    global logger
     logging.basicConfig(level=logging.INFO,
                         format='%(asctime)s %(levelname)s %(message)s',
                         filename='getan.log',
diff -r aa6c4aca2f8d -r d4ce02a33acd getan/resources.py
--- a/getan/resources.py	Wed Dec 15 10:38:15 2010 +0100
+++ b/getan/resources.py	Wed Dec 15 11:35:59 2010 +0100
@@ -1,6 +1,5 @@
 import gettext as py_gettext
 import os
-import sys
 
 _base_dir = os.path.join(os.path.dirname(__file__), os.pardir)
 share_dir = os.path.join(_base_dir, "share")
diff -r aa6c4aca2f8d -r d4ce02a33acd getan/states.py
--- a/getan/states.py	Wed Dec 15 10:38:15 2010 +0100
+++ b/getan/states.py	Wed Dec 15 11:35:59 2010 +0100
@@ -88,7 +88,6 @@
         return self
 
     def select(self):
-        proj_node = self.view.select()
         self.controller.start_project(self.view.item_in_focus())
         return RunningProjectsState(self.controller, self.view)
 
@@ -231,7 +230,10 @@
             self.footer.set_edit_pos(pos)
         elif len(key) >= 1 and len(key[0]) == 1:
             return self.insert(key)
-        return self   
+        return self
+
+    def enter(self):
+        raise Exception("Not implemented")
 
     def exit(self):
         return self.state
@@ -244,12 +246,12 @@
 
 class BaseTimeState(HandleUserInputState):
     def __init__(self, controller, view, running_state):
-        super(BaseTimeState, self).__init__(controller, view, running_state,
+        super(HandleUserInputState, self).__init__(controller, view, running_state,
                                            view.frame.get_footer())
 
     def exit(self):
         self.view._total_time()
-        return self.running_state
+        return self.state
 
     def insert(self, key):
         if key[0] in ['0','1','2','3','4','5','6','7','8','9']: