changeset 5289:ed6df6b1c29a

Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 07 Sep 2007 17:38:52 +0200
parents aea35488ea66
children 05889b6b1468 23651848d638
files mercurial/hgweb/hgweb_mod.py mercurial/hgweb/hgwebdir_mod.py
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hgweb/hgweb_mod.py	Fri Aug 31 22:31:43 2007 +0200
+++ b/mercurial/hgweb/hgweb_mod.py	Fri Sep 07 17:38:52 2007 +0200
@@ -65,7 +65,8 @@
 class hgweb(object):
     def __init__(self, repo, name=None):
         if type(repo) == type(""):
-            self.repo = hg.repository(ui.ui(report_untrusted=False), repo)
+            parentui = ui.ui(report_untrusted=False, interactive=False)
+            self.repo = hg.repository(parentui, repo)
         else:
             self.repo = repo
 
--- a/mercurial/hgweb/hgwebdir_mod.py	Fri Aug 31 22:31:43 2007 +0200
+++ b/mercurial/hgweb/hgwebdir_mod.py	Fri Sep 07 17:38:52 2007 +0200
@@ -83,7 +83,8 @@
             else:
                 yield config('web', 'motd', '')
 
-        parentui = self.parentui or ui.ui(report_untrusted=False)
+        parentui = self.parentui or ui.ui(report_untrusted=False,
+                                          interactive=False)
 
         def config(section, name, default=None, untrusted=True):
             return parentui.config(section, name, default, untrusted)