...

[iramuteq] / iramuteq.py

diff --git a/iramuteq.py b/iramuteq.py
index d729c40..d3ae6f3 100644 (file)
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -28,8 +28,10 @@ import logging
 #------------------------------------
 import wx
 #import wx.aui
 #------------------------------------
 import wx
 #import wx.aui

-#import wx.lib.agw.aui as aui
-import agw.aui as aui
+if wx.__version__ >= '2.11' :
+    import wx.lib.agw.aui as aui
+else :
+    import aui

 import wx.html
 import wx.grid
 import wx.lib.hyperlink as hl
 import wx.html
 import wx.grid
 import wx.lib.hyperlink as hl


@@ -59,7 +61,7 @@ from textwordcloud import WordCloud
 from profile_segment import ProfileSegment
 from textcheckcorpus import checkcorpus
 from openanalyse import OpenAnalyse
 from profile_segment import ProfileSegment
 from textcheckcorpus import checkcorpus
 from openanalyse import OpenAnalyse

-from corpusNG import BuildFromAlceste, Builder
+from corpus import BuildFromAlceste, Builder

 from sheet import MySheet
 from checkinstall import CreateIraDirectory, CheckRPath, FindRPAthWin32, FindRPathNix, CheckRPackages, IsNew, UpgradeConf, CopyConf, RLibsAreInstalled
 from chemins import ConstructRscriptsPath, ConstructConfigPath, ConstructDicoPath, ConstructGlobalPath, PathOut
 from sheet import MySheet
 from checkinstall import CreateIraDirectory, CheckRPath, FindRPAthWin32, FindRPathNix, CheckRPackages, IsNew, UpgradeConf, CopyConf, RLibsAreInstalled
 from chemins import ConstructRscriptsPath, ConstructConfigPath, ConstructDicoPath, ConstructGlobalPath, PathOut


@@ -122,20 +124,28 @@ CreateIraDirectory(UserConfigPath, AppliPath)
 #fichiers log pour windows (py2exe)
 log = logging.getLogger('iramuteq')
 fh = logging.FileHandler(os.path.join(UserConfigPath,'stdout.log'))
 #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')
 formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')

-ch.setFormatter(formatter)

 fh.setFormatter(formatter)
 fh.setFormatter(formatter)

-log.addHandler(ch)

 log.addHandler(fh)
 log.addHandler(fh)

+if sys.platform != 'win32' and sys.platform != 'darwin':
+    ch = logging.StreamHandler()
+    ch.setFormatter(formatter)
+    log.addHandler(ch)

 log.setLevel(logging.INFO)
 
 log.setLevel(logging.INFO)
 

-

 class writer(object):
     def write(self, data):
         if data.strip() != '' :
 class writer(object):
     def write(self, data):
         if data.strip() != '' :

-            log.info('BUG : %s' % data)
+            log.info('ERROR : %s' % data)
+
+class printer(object) :
+    def write(self, data) :
+        if data.strip() != '' :
+            log.info('Print : %s' % data)
+

 sys.stderr = writer()
 sys.stderr = writer()

+sys.stdout = printer()
+

 ConfigPath = ConstructConfigPath(UserConfigPath)
 #####################################################################
 
 ConfigPath = ConstructConfigPath(UserConfigPath)
 #####################################################################