Merge branch 'master' of http://www.netdig.org/git/iramuteq

diff --git a/iramuteq.desktop b/iramuteq.desktop
deleted file mode 100644 (file)
index 36f9dce..0000000
--- a/iramuteq.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Version=0.0.1
-Type=Application
-Name=IRaMuTeQ
-Exec=iramuteq
-Terminal=false
-Categories=Education;Science;
-Icon=/usr/share/icons/iraicone.png

diff --git a/iramuteq.py b/iramuteq.py
index c211567..20db754 100644 (file)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -124,16 +124,15 @@ CreateIraDirectory(UserConfigPath, AppliPath)
 #fichiers log pour windows (py2exe)
 log = logging.getLogger('iramuteq')
 fh = logging.FileHandler(os.path.join(UserConfigPath,'stdout.log'))
-ch = logging.StreamHandler()
 formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
-ch.setFormatter(formatter)
 fh.setFormatter(formatter)
 log.addHandler(fh)
-if sys.platform != 'win32' or sys.platform != 'darwin':
+if sys.platform != 'win32' and sys.platform != 'darwin':
+    ch = logging.StreamHandler()
+    ch.setFormatter(formatter)
     log.addHandler(ch)
 log.setLevel(logging.INFO)
 
-
 class writer(object):
     def write(self, data):
         if data.strip() != '' :