Merge pull request #1027 from oesteban/fix/RedirectX

FIX: Interfaces redirecting X crashed if $DISPLAY not defined

Author: oesteban

CHANGES

@@ -1,5 +1,7 @@
 Next release
 ============
+
+* FIX: Interfaces redirecting X crashed if $DISPLAY not defined (https://github.com/nipy/nipype/pull/1027)
 * FIX: Bug crashed 'make api' (https://github.com/nipy/nipype/pull/1026)
 * ENH: Updated antsIntroduction to handle RA and RI registrations (https://github.com/nipy/nipype/pull/1009)
 * ENH: Updated N4BiasCorrection input spec to include weight image and spline order. Made 

nipype/interfaces/base.py

@@ -758,12 +758,12 @@ def _get_trait_desc(self, inputs, name, spec):
         manhelpstr = ['\t%s' % name]
 
         type_info = spec.full_info(inputs, name, None)
-        default = ''
 
+        default = ''
         if spec.usedefault:
             default = ', nipype default value: %s' % str(spec.default_value()[1])
-
         line = "(%s%s)" % (type_info, default)
+
         manhelpstr = wrap(line, 70,
                           initial_indent=manhelpstr[0]+': ',
                           subsequent_indent='\t\t ')
@@ -991,7 +991,7 @@ def run(self, **inputs):
                     time.sleep(0.2)  # give Xvfb time to start
                     if xvfb_proc.poll() is not None:
                         raise Exception('Error: Xvfb did not start')
-                    old_displaynum = os.environ['DISPLAY']
+
                     runtime.environ['DISPLAY'] = ':%s' % vdisplay_num
 
             runtime = self._run_interface(runtime)