[Jython-checkins] CVS: jython/org/python/util PyServlet.java,1.12,1.13 PythonInterpreter.java,2.10,2.11 jython.java,2.22,2.23

[Finn B. <bc...@us...>]

Update of /cvsroot/jython/jython/org/python/util
In directory usw-pr-cvs1:/tmp/cvs-serv31804/util

Modified Files:
	PyServlet.java PythonInterpreter.java jython.java 
Log Message:
Long line normalization.



Index: PyServlet.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PyServlet.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** PyServlet.java	2001/11/27 13:51:38	1.12
--- PyServlet.java	2001/11/27 19:07:22	1.13
***************
*** 78,87 ****
          }
          if (props.getProperty("python.home") == null &&
!                                    System.getProperty("python.home") == null) {
              props.put("python.home", rootPath + "WEB-INF" +
                                               File.separator + "lib");
          }
  
!         PythonInterpreter.initialize(System.getProperties(), props, new String[0]);
          reset();
  
--- 78,88 ----
          }
          if (props.getProperty("python.home") == null &&
!                                 System.getProperty("python.home") == null) {
              props.put("python.home", rootPath + "WEB-INF" +
                                               File.separator + "lib");
          }
  
!         PythonInterpreter.initialize(System.getProperties(), props,
!                                      new String[0]);
          reset();
  
***************
*** 111,115 ****
          req.setAttribute("pyservlet", this);
  
!         String spath = (String)req.getAttribute("javax.servlet.include.servlet_path");
          if (spath == null) {
              spath = ((HttpServletRequest) req).getServletPath();
--- 112,117 ----
          req.setAttribute("pyservlet", this);
  
!         String spath = (String)req.getAttribute(
!                                     "javax.servlet.include.servlet_path");
          if (spath == null) {
              spath = ((HttpServletRequest) req).getServletPath();

Index: PythonInterpreter.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/PythonInterpreter.java,v
retrieving revision 2.10
retrieving revision 2.11
diff -C2 -d -r2.10 -r2.11
*** PythonInterpreter.java	2001/11/27 13:51:38	2.10
--- PythonInterpreter.java	2001/11/27 19:07:22	2.11
***************
*** 135,139 ****
      public void exec(String s) {
          setState();
!         Py.exec(Py.compile_flags(s, "<string>", "exec",cflags), locals, locals);
      }
  
--- 135,140 ----
      public void exec(String s) {
          setState();
!         Py.exec(Py.compile_flags(s, "<string>", "exec",cflags),
!                 locals, locals);
      }
  

Index: jython.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/util/jython.java,v
retrieving revision 2.22
retrieving revision 2.23
diff -C2 -d -r2.22 -r2.23
*** jython.java	2001/11/27 13:51:38	2.22
--- jython.java	2001/11/27 19:07:22	2.23
***************
*** 12,16 ****
          "Options and arguments:\n"+
          "-i       : inspect interactively after running script, and force\n"+
!         "           prompts, even if stdin does not appear to be a terminal\n"+
          "-S       : don't imply `import site' on initialization\n"+
          "-v       : verbose (trace import statements)\n"+
--- 12,17 ----
          "Options and arguments:\n"+
          "-i       : inspect interactively after running script, and force\n"+
!         "           prompts, even if stdin does not appear to be a "+
!                     "terminal\n"+
          "-S       : don't imply `import site' on initialization\n"+
          "-v       : verbose (trace import statements)\n"+
***************
*** 18,22 ****
          "-jar jar : program read from __run__.py in jar file\n"+
          "-c cmd   : program passed in as string (terminates option list)\n"+
!         "-W arg   : warning control (arg is action:message:category:module:lineno)\n"+
          "-E codec : Use a different codec the reading from the console.\n"+
          "file     : program read from script file\n"+
--- 19,24 ----
          "-jar jar : program read from __run__.py in jar file\n"+
          "-c cmd   : program passed in as string (terminates option list)\n"+
!         "-W arg   : warning control (arg is action:message:category:module:"+
!                     "lineno)\n"+
          "-E codec : Use a different codec the reading from the console.\n"+
          "file     : program read from script file\n"+
***************
*** 110,116 ****
                  if (opts.notice) {
                      PyObject builtins = Py.getSystemState().builtins;
!                     boolean copyright = builtins.__finditem__("copyright") != null;
!                     boolean credits   = builtins.__finditem__("credits") != null;
!                     boolean license   = builtins.__finditem__("license") != null;
                      if (copyright) {
                          msg += "\"copyright\"";
--- 112,121 ----
                  if (opts.notice) {
                      PyObject builtins = Py.getSystemState().builtins;
!                     boolean copyright =
!                                 builtins.__finditem__("copyright") != null;
!                     boolean credits =
!                                 builtins.__finditem__("credits") != null;
!                     boolean license =
!                                 builtins.__finditem__("license") != null;
                      if (copyright) {
                          msg += "\"copyright\"";
***************
*** 128,132 ****
                          msg += "\"license\"";
                      if (msg.length() > 0)
!                         System.err.println("Type " + msg + " for more information.");
                  }
              } catch (PyException pye) {
--- 133,138 ----
                          msg += "\"license\"";
                      if (msg.length() > 0)
!                         System.err.println("Type " + msg +
!                                            " for more information.");
                  }
              } catch (PyException pye) {