[Docutils-checkins] sandbox/paultremblay/docutils_nest/docutils_nest nest_docutils.py,1.2,1.3 read_config.py,1.1,1.2

[Paul H. T. <pau...@us...>]

Update of /cvsroot/docutils/sandbox/paultremblay/docutils_nest/docutils_nest
In directory sc8-pr-cvs1:/tmp/cvs-serv26034/paultremblay/docutils_nest/docutils_nest

Modified Files:
	nest_docutils.py read_config.py 
Log Message:
fix bugs in setup

Index: nest_docutils.py
===================================================================
RCS file: /cvsroot/docutils/sandbox/paultremblay/docutils_nest/docutils_nest/nest_docutils.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- nest_docutils.py	15 Jun 2003 05:26:20 -0000	1.2
+++ nest_docutils.py	15 Jun 2003 16:33:00 -0000	1.3
@@ -10,12 +10,12 @@
 
 
 """
+outer_dir =  docutils_nest.location.get_location()
+doc_nest_dir = os.path.join(outer_dir, '.docutils_nest')
 
 
 class GetOptions:
     def __init__(self, sys_string):
-        outer_dir =  docutils_nest.location.get_location()
-        self.__doc_nest_dir = os.path.join(outer_dir, '.docutils_nest')
         self.__sys_string = sys_string
 
     def get_options(self):
@@ -98,7 +98,7 @@
         self.__output = output
 
     def nest_tags(self):
-        config_file = os.path.join(self.__doc_nest_dir, 'configure.xml')
+        config_file = os.path.join(doc_nest_dir, 'configure.xml')
         config_obj = GetConfig(config_file)
         config_values = config_obj.get_config()
         tags_obj = MakeTags(self.__file, self.__output, config_values)
@@ -113,7 +113,7 @@
     # sys.exit(0)
     options_obj = GetOptions(sys.argv)
     file, output = options_obj.get_options()
-    config_file = os.path.join(self.__doc_nest_dir, 'configure.xml')
+    config_file = os.path.join(doc_nest_dir, 'configure.xml')
     config_obj = GetConfig(config_file)
     config_values = config_obj.get_config()
     tags_obj = MakeTags(file, output, config_values)

Index: read_config.py
===================================================================
RCS file: /cvsroot/docutils/sandbox/paultremblay/docutils_nest/docutils_nest/read_config.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- read_config.py	13 Jun 2003 03:06:52 -0000	1.1
+++ read_config.py	15 Jun 2003 16:33:00 -0000	1.2
@@ -123,8 +123,7 @@
         """
         file_exists = os.path.exists(file)
         if not file_exists:
-            sys.stderr.write('file does not exist\n')
-            sys.exit(1)
+            raise IOError, 'file %s does not exist' % file
         self.__file = file
 
     def read_configs(self):