[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35729] trunk/blender/release/scripts/ modules/bpy/__init__.py: missed committing this before

Campbell Barton ideasman42 at gmail.com
Wed Mar 23 16:14:22 CET 2011


Revision: 35729
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35729
Author:   campbellbarton
Date:     2011-03-23 15:14:21 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
missed committing this before

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy/__init__.py

Modified: trunk/blender/release/scripts/modules/bpy/__init__.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/__init__.py	2011-03-23 15:07:30 UTC (rev 35728)
+++ trunk/blender/release/scripts/modules/bpy/__init__.py	2011-03-23 15:14:21 UTC (rev 35729)
@@ -53,65 +53,5 @@
     else:
         utils.load_scripts()
 
-    import os
 
-    # test for X11
-    if os.environ.get("DISPLAY"):
-
-        # BSD licenced code copied from python, temp fix for bug
-        # http://bugs.python.org/issue11432, XXX == added code
-        def _invoke(self, args, remote, autoraise):
-            # XXX, added imports
-            import io
-            import subprocess
-            import time
-
-            raise_opt = []
-            if remote and self.raise_opts:
-                # use autoraise argument only for remote invocation
-                autoraise = int(autoraise)
-                opt = self.raise_opts[autoraise]
-                if opt:
-                    raise_opt = [opt]
-
-            cmdline = [self.name] + raise_opt + args
-
-            if remote or self.background:
-                inout = io.open(os.devnull, "r+")
-            else:
-                # for TTY browsers, we need stdin/out
-                inout = None
-            # if possible, put browser in separate process group, so
-            # keyboard interrupts don't affect browser as well as Python
-            setsid = getattr(os, 'setsid', None)
-            if not setsid:
-                setsid = getattr(os, 'setpgrp', None)
-
-            p = subprocess.Popen(cmdline, close_fds=True,  # XXX, stdin=inout,
-                                 stdout=(self.redirect_stdout and inout or None),
-                                 stderr=inout, preexec_fn=setsid)
-            if remote:
-                # wait five secons. If the subprocess is not finished, the
-                # remote invocation has (hopefully) started a new instance.
-                time.sleep(1)
-                rc = p.poll()
-                if rc is None:
-                    time.sleep(4)
-                    rc = p.poll()
-                    if rc is None:
-                        return True
-                # if remote call failed, open() will try direct invocation
-                return not rc
-            elif self.background:
-                if p.poll() is None:
-                    return True
-                else:
-                    return False
-            else:
-                return not p.wait()
-
-        import webbrowser
-        webbrowser.UnixBrowser._invoke = _invoke
-
-
 _main()




More information about the Bf-blender-cvs mailing list