From: Debian Python Team <team+python@tracker.debian.org>
Date: Thu, 20 Mar 2025 12:56:44 +0000 (+0100)
Subject: cgitb
X-Git-Tag: archive/raspbian/6.3.2-1+rpi1+deb12u1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=82242d11f0a45430ca1501e98623360c9972af45;p=mercurial.git

cgitb

https://bz.mercurial-scm.org/show_bug.cgi?id=6784


Gbp-Pq: Name cgitb.patch
---

diff --git a/tests/test-clone-cgi.t b/tests/test-clone-cgi.t
index dc35add..037b005 100644
--- a/tests/test-clone-cgi.t
+++ b/tests/test-clone-cgi.t
@@ -12,8 +12,6 @@ initialize repository
   $ cat >hgweb.cgi <<HGWEB
   > #
   > # An example CGI script to use hgweb, edit as necessary
-  > import cgitb
-  > cgitb.enable()
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -26,7 +24,7 @@ try hgweb request
 
   $ . "$TESTDIR/cgienv"
   $ QUERY_STRING="cmd=changegroup&roots=0000000000000000000000000000000000000000"; export QUERY_STRING
-  $ "$PYTHON" hgweb.cgi >page1 2>&1
+  $ "$PYTHON" hgweb.cgi >page1
   $ "$PYTHON" "$TESTDIR/md5sum.py" page1
   1f424bb22ec05c3c6bc866b6e67efe43  page1
 
diff --git a/tests/test-newcgi.t b/tests/test-newcgi.t
index 8548387..438fb0a 100644
--- a/tests/test-newcgi.t
+++ b/tests/test-newcgi.t
@@ -9,9 +9,6 @@ before d74fc8dec2b4 still work.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -35,9 +32,6 @@ before d74fc8dec2b4 still work.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgwebdir
   > from mercurial.hgweb import wsgicgi
diff --git a/tests/test-newercgi.t b/tests/test-newercgi.t
index 67592af..5bc0a2d 100644
--- a/tests/test-newercgi.t
+++ b/tests/test-newercgi.t
@@ -9,9 +9,6 @@ This is a rudimentary test of the CGI files as of d74fc8dec2b4.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
@@ -32,9 +29,6 @@ This is a rudimentary test of the CGI files as of d74fc8dec2b4.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb
-  > cgitb.enable()
-  > 
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgwebdir
   > from mercurial.hgweb import wsgicgi
diff --git a/tests/test-oldcgi.t b/tests/test-oldcgi.t
index b393e1a..e4acf2a 100644
--- a/tests/test-oldcgi.t
+++ b/tests/test-oldcgi.t
@@ -8,9 +8,6 @@ This tests if CGI files from before d0db3462d568 still work.
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb, os, sys
-  > cgitb.enable()
-  > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
   > 
@@ -30,9 +27,6 @@ This tests if CGI files from before d0db3462d568 still work.
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb, sys
-  > cgitb.enable()
-  > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
   > 
diff --git a/tests/test-push-cgi.t b/tests/test-push-cgi.t
index 8c45ab4..185d4a8 100644
--- a/tests/test-push-cgi.t
+++ b/tests/test-push-cgi.t
@@ -16,8 +16,6 @@ initialize repository
 create hgweb invocation script
 
   $ cat >hgweb.cgi <<HGWEB
-  > import cgitb
-  > cgitb.enable()
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi