gnue/navigator/src GNObjects.py UIwxpython.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    03/01/11 12:05:30

Modified files:
        navigator/src  : GNObjects.py UIwxpython.py 

Log message:
        fixed reports imports

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNObjects.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text

Patches:
Index: gnue/navigator/src/GNObjects.py
diff -c gnue/navigator/src/GNObjects.py:1.15 
gnue/navigator/src/GNObjects.py:1.16
*** gnue/navigator/src/GNObjects.py:1.15        Wed Jan  1 19:45:48 2003
--- gnue/navigator/src/GNObjects.py     Sat Jan 11 12:05:30 2003
***************
*** 30,36 ****
  import sys, string, os, os.path
  from gnue.common import GObjects, GDebug, GConfig, GRootObj
  import GNParser
! from gnue.reports import GREngine,GRExceptions
  
  # Base class for all Navigator objects
  class GNObject(GObjects.GObj):
--- 30,40 ----
  import sys, string, os, os.path
  from gnue.common import GObjects, GDebug, GConfig, GRootObj
  import GNParser
! try: 
!   from gnue.reports.base import GREngine,GRExceptions
!   REPORTS_SUPPORT=0
! except ImportError:
!   REPORTS_SUPPORT=1
  
  # Base class for all Navigator objects
  class GNObject(GObjects.GObj):
***************
*** 86,91 ****
--- 90,100 ----
        os.spawnve(os.P_NOWAIT,command[0],command,os.environ)
  
    def _runReport(self, step):
+     global REPORTS_SUPPORT
+     if not REPORTS_SUPPORT: 
+       print "WARNING: Reports support not installed!"
+       return 
+       
      reportCommand = gConfigNav('RunReportCommand')
  
      # get the name of the report
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.25 
gnue/navigator/src/UIwxpython.py:1.26
*** gnue/navigator/src/UIwxpython.py:1.25       Wed Jan  1 19:45:48 2003
--- gnue/navigator/src/UIwxpython.py    Sat Jan 11 12:05:30 2003
***************
*** 41,48 ****
    from gnue.forms.GFInstance import GFInstance
    from gnue.forms import GFParser
    from gnue.forms.uidrivers import wx as ui
  except ImportError:
!   raise 'GNUe Forms is not installed on your system'
  
  images_dir = GConfig.getInstalledBase('forms_images','common_images') + '/'
  print images_dir
--- 41,50 ----
    from gnue.forms.GFInstance import GFInstance
    from gnue.forms import GFParser
    from gnue.forms.uidrivers import wx as ui
+   FORMS_SUPPORT=0
  except ImportError:
!   FORMS_SUPPORT=1
!   print 'GNUe Forms is not installed on your system'
  
  images_dir = GConfig.getInstalledBase('forms_images','common_images') + '/'
  print images_dir