changeset 50734:d5cd1fd690f3 stable

hgweb: drop references to deprecated cgitb cgitb is going away and gives warnings when importing, and that make tests fail: $TESTTMP/hgweb.cgi:5: DeprecationWarning: 'cgitb' is deprecated and slated for removal in Python 3.13 The lack of a "nice" high level error handler is not a huge problem, neither for users (where it is disabled anyway) or for tests (where we don't use a browser and the plain tracebacks often are more readable). It is inevitable that it is going away, and there is no obvious alternative. Remove it and move on.
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 26 Jun 2023 18:00:28 +0200
parents b1ac55606eb7
children 2b0598121a71
files contrib/hgweb.fcgi contrib/hgweb.wsgi hgweb.cgi tests/test-clone-cgi.t tests/test-mq.t tests/test-newcgi.t tests/test-newercgi.t tests/test-oldcgi.t tests/test-push-cgi.t
diffstat 9 files changed, 2 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/hgweb.fcgi	Tue Jun 27 12:09:17 2023 +0200
+++ b/contrib/hgweb.fcgi	Mon Jun 26 18:00:28 2023 +0200
@@ -9,9 +9,6 @@
 # (consult "installed modules" path from 'hg debuginstall'):
 # import sys; sys.path.insert(0, "/path/to/python/lib")
 
-# Uncomment to send python tracebacks to the browser if an error occurs:
-# import cgitb; cgitb.enable()
-
 from mercurial import demandimport
 
 demandimport.enable()
--- a/contrib/hgweb.wsgi	Tue Jun 27 12:09:17 2023 +0200
+++ b/contrib/hgweb.wsgi	Mon Jun 26 18:00:28 2023 +0200
@@ -8,9 +8,6 @@
 # (consult "installed modules" path from 'hg debuginstall'):
 #import sys; sys.path.insert(0, "/path/to/python/lib")
 
-# Uncomment to send python tracebacks to the browser if an error occurs:
-#import cgitb; cgitb.enable()
-
 # enable demandloading to reduce startup time
 from mercurial import demandimport; demandimport.enable()
 
--- a/hgweb.cgi	Tue Jun 27 12:09:17 2023 +0200
+++ b/hgweb.cgi	Mon Jun 26 18:00:28 2023 +0200
@@ -10,9 +10,6 @@
 # (consult "installed modules" path from 'hg debuginstall'):
 # import sys; sys.path.insert(0, "/path/to/python/lib")
 
-# Uncomment to send python tracebacks to the browser if an error occurs:
-# import cgitb; cgitb.enable()
-
 from mercurial import demandimport
 
 demandimport.enable()
--- a/tests/test-clone-cgi.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-clone-cgi.t	Mon Jun 26 18:00:28 2023 +0200
@@ -12,8 +12,6 @@
   $ 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
--- a/tests/test-mq.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-mq.t	Mon Jun 26 18:00:28 2023 +0200
@@ -1581,8 +1581,6 @@
   > from mercurial import demandimport; demandimport.enable()
   > from mercurial.hgweb import hgweb
   > from mercurial.hgweb import wsgicgi
-  > import cgitb
-  > cgitb.enable()
   > app = hgweb(b'.', b'test')
   > wsgicgi.launch(app)
   > HGWEB
--- a/tests/test-newcgi.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-newcgi.t	Mon Jun 26 18:00:28 2023 +0200
@@ -9,9 +9,6 @@
   > #
   > # 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 @@
   > #
   > # 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
--- a/tests/test-newercgi.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-newercgi.t	Mon Jun 26 18:00:28 2023 +0200
@@ -9,9 +9,6 @@
   > #
   > # 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 @@
   > #
   > # 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
--- a/tests/test-oldcgi.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-oldcgi.t	Mon Jun 26 18:00:28 2023 +0200
@@ -8,8 +8,7 @@
   > #
   > # An example CGI script to use hgweb, edit as necessary
   > 
-  > import cgitb, os, sys
-  > cgitb.enable()
+  > import os, sys
   > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
@@ -30,8 +29,7 @@
   > #
   > # An example CGI script to export multiple hgweb repos, edit as necessary
   > 
-  > import cgitb, sys
-  > cgitb.enable()
+  > import sys
   > 
   > # sys.path.insert(0, "/path/to/python/lib") # if not a system-wide install
   > from mercurial import hgweb
--- a/tests/test-push-cgi.t	Tue Jun 27 12:09:17 2023 +0200
+++ b/tests/test-push-cgi.t	Mon Jun 26 18:00:28 2023 +0200
@@ -16,8 +16,6 @@
 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