[Jython-checkins] SF.net SVN: jython:[6325] trunk/jython/src/org/python/core/util/FileUtil. java

[<pj...@us...>]

Revision: 6325
          http://jython.svn.sourceforge.net/jython/?rev=6325&view=rev
Author:   pjenvey
Date:     2009-05-10 06:42:35 +0000 (Sun, 10 May 2009)

Log Message:
-----------
small cleanup

Modified Paths:
--------------
    trunk/jython/src/org/python/core/util/FileUtil.java

Modified: trunk/jython/src/org/python/core/util/FileUtil.java
===================================================================
--- trunk/jython/src/org/python/core/util/FileUtil.java	2009-05-10 05:54:19 UTC (rev 6324)
+++ trunk/jython/src/org/python/core/util/FileUtil.java	2009-05-10 06:42:35 UTC (rev 6325)
@@ -66,16 +66,12 @@
     }
 
     public static boolean isatty(FileDescriptor fd) {
-        boolean atty = false;
         try {
-            atty = imp.load("os").__getattr__("isatty").__call__(Py.java2py(fd)).__nonzero__();
+            return imp.load("os").__getattr__("isatty").__call__(Py.java2py(fd)).__nonzero__();
         } catch (PyException e) {
-            //Weak isatty check copied from jna-posix JavaPOSIX class
-            return (fd == FileDescriptor.in
-                    || fd == FileDescriptor.out
-                    || fd == FileDescriptor.err);
+            // Weak isatty check copied from jna-posix JavaPOSIX class
+            return fd == FileDescriptor.in || fd == FileDescriptor.out || fd == FileDescriptor.err;
         }
-        return atty;
     }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.