r20216 - in /branches/relax_disp: ./ pipe_control/palmer.py -- June 19, 2013 - 15:37

Author: bugman
Date: Wed Jun 19 15:37:26 2013
New Revision: 20216

URL: http://svn.gna.org/viewcvs/relax?rev=20216&view=rev
Log:
Merged revisions 20215 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20215 | bugman | 2013-06-19 15:37:00 +0200 (Wed, 19 Jun 2013) | 3 lines
  
  Fix for some fatally incorrect code committed at r20213.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/palmer.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 19 15:37:26 2013
@@ -1,1 +1,1 @@
-/trunk:1-20213
+/trunk:1-20215

Modified: branches/relax_disp/pipe_control/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/palmer.py?rev=20216&r1=20215&r2=20216&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/palmer.py (original)
+++ branches/relax_disp/pipe_control/palmer.py Wed Jun 19 15:37:26 2013
@@ -30,7 +30,7 @@
 from math import pi
 from os import F_OK, access, chdir, chmod, getcwd, listdir, remove, sep, 
system
 from re import match, search
-from stat import S_IRWXU|S_IRGRP|S_IROTH
+from stat import S_IRWXU, S_IRGRP, S_IROTH
 PIPE, Popen = None, None
 if dep_check.subprocess_module:
     from subprocess import PIPE, Popen