tests: fix style issue of importing hgweb in embedded code fragments

Some test scripts are excluded in test-check-module-imports.t, because
import-checker.py reports that hgweb and/or hgwebdir of
mercurial.hgweb are not imported in recommended style.

To fix this issues, this patch make python code fragments embedded in
these files import hgweb from mercurial package at first, and refer
hgweb and hgwebdir via imported hgweb.

tests/test-hgweb-no-path-info.t

@@ -1,150 +1,147 b''
 This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
 no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
 should be used from d74fc8dec2b4 onward to route the request.
 
   $ hg init repo
   $ cd repo
   $ echo foo > bar
   $ hg add bar
   $ hg commit -m "test"
   $ hg tip
   changeset:   0:61c9426e69fe
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ cat > request.py <<EOF
   > from __future__ import absolute_import
   > import os
   > import sys
-  > from mercurial.hgweb import (
+  > from mercurial import (
   >     hgweb,
-  >     hgwebdir,
-  > )
-  > from mercurial import (
   >     util,
   > )
   > stringio = util.stringio
   > 
   > errors = stringio()
   > input = stringio()
   > 
   > def startrsp(status, headers):
   >     print('---- STATUS')
   >     print(status)
   >     print('---- HEADERS')
   >     print([i for i in headers if i[0] != 'ETag'])
   >     print('---- DATA')
   >     sys.stdout.flush()
   >     return output.write
   > 
   > env = {
   >     'wsgi.version': (1, 0),
   >     'wsgi.url_scheme': 'http',
   >     'wsgi.errors': errors,
   >     'wsgi.input': input,
   >     'wsgi.multithread': False,
   >     'wsgi.multiprocess': False,
   >     'wsgi.run_once': False,
   >     'REQUEST_METHOD': 'GET',
   >     'PATH_INFO': '/',
   >     'SCRIPT_NAME': '',
   >     'SERVER_NAME': '$LOCALIP',
   >     'SERVER_PORT': os.environ['HGPORT'],
   >     'SERVER_PROTOCOL': 'HTTP/1.0'
   > }
   > 
   > def process(app):
   >     try:
   >         stdout = sys.stdout.buffer
   >     except AttributeError:
   >         stdout = sys.stdout
   >     content = app(env, startrsp)
   >     stdout.write(output.getvalue())
   >     stdout.write(b''.join(content))
   >     stdout.flush()
   >     getattr(content, 'close', lambda : None)()
   >     if errors.getvalue():
   >         print('---- ERRORS')
   >         print(errors.getvalue())
   >     sys.stdout.flush()
   > 
   > output = stringio()
   > env['QUERY_STRING'] = 'style=atom'
-  > process(hgweb(b'.', name=b'repo'))
+  > process(hgweb.hgweb(b'.', name=b'repo'))
   > 
   > output = stringio()
   > env['QUERY_STRING'] = 'style=raw'
-  > process(hgwebdir({b'repo': b'.'}))
+  > process(hgweb.hgwebdir({b'repo': b'.'}))
   > EOF
   $ "$PYTHON" request.py
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'application/atom+xml; charset=ascii')]
   ---- DATA
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
    <id>http://$LOCALIP:$HGPORT/</id> (glob)
    <link rel="self" href="http://$LOCALIP:$HGPORT/atom-log"/> (glob)
    <link rel="alternate" href="http://$LOCALIP:$HGPORT/"/> (glob)
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>[default] test</title>
     <id>http://$LOCALIP:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
     <link href="http://$LOCALIP:$HGPORT/rev/61c9426e69fe"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
     </author>
     <updated>1970-01-01T00:00:00+00:00</updated>
     <published>1970-01-01T00:00:00+00:00</published>
     <content type="xhtml">
      <table xmlns="http://www.w3.org/1999/xhtml">
       <tr>
        <th style="text-align:left;">changeset</th>
        <td>61c9426e69fe</td>
       </tr>
       <tr>
        <th style="text-align:left;">branch</th>
        <td>default</td>
       </tr>
       <tr>
        <th style="text-align:left;">bookmark</th>
        <td></td>
       </tr>
       <tr>
        <th style="text-align:left;">tag</th>
        <td>tip</td>
       </tr>
       <tr>
        <th style="text-align:left;">user</th>
        <td>&#116;&#101;&#115;&#116;</td>
       </tr>
       <tr>
        <th style="text-align:left;vertical-align:top;">description</th>
        <td>test</td>
       </tr>
       <tr>
        <th style="text-align:left;vertical-align:top;">files</th>
        <td>bar<br /></td>
       </tr>
      </table>
     </content>
    </entry>
   
   </feed>
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'text/plain; charset=ascii')]
   ---- DATA
   
   /repo/
   
 
   $ cd ..

tests/test-hgweb-no-request-uri.t

@@ -1,180 +1,177 b''
 This tests if hgweb and hgwebdir still work if the REQUEST_URI variable is
 no longer passed with the request. Instead, SCRIPT_NAME and PATH_INFO
 should be used from d74fc8dec2b4 onward to route the request.
 
   $ hg init repo
   $ cd repo
   $ echo foo > bar
   $ hg add bar
   $ hg commit -m "test"
   $ hg tip
   changeset:   0:61c9426e69fe
   tag:         tip
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     test
   
   $ cat > request.py <<EOF
   > from __future__ import absolute_import
   > import os
   > import sys
-  > from mercurial.hgweb import (
-  >     hgweb,
-  >     hgwebdir,
-  > )
   > from mercurial import (
   >     encoding,
+  >     hgweb,
   >     util,
   > )
   > stringio = util.stringio
   > 
   > errors = stringio()
   > input = stringio()
   > 
   > def startrsp(status, headers):
   >     print('---- STATUS')
   >     print(status)
   >     print('---- HEADERS')
   >     print([i for i in headers if i[0] != 'ETag'])
   >     print('---- DATA')
   >     return output.write
   > 
   > env = {
   >     'wsgi.version': (1, 0),
   >     'wsgi.url_scheme': 'http',
   >     'wsgi.errors': errors,
   >     'wsgi.input': input,
   >     'wsgi.multithread': False,
   >     'wsgi.multiprocess': False,
   >     'wsgi.run_once': False,
   >     'REQUEST_METHOD': 'GET',
   >     'SCRIPT_NAME': '',
   >     'SERVER_NAME': '$LOCALIP',
   >     'SERVER_PORT': os.environ['HGPORT'],
   >     'SERVER_PROTOCOL': 'HTTP/1.0'
   > }
   > 
   > def process(app):
   >     content = app(env, startrsp)
   >     sys.stdout.write(encoding.strfromlocal(output.getvalue()))
   >     sys.stdout.write(encoding.strfromlocal(b''.join(content)))
   >     getattr(content, 'close', lambda : None)()
   >     print('---- ERRORS')
   >     print(encoding.strfromlocal(errors.getvalue())) # avoid b'' output diff
   > 
   > output = stringio()
   > env['PATH_INFO'] = '/'
   > env['QUERY_STRING'] = 'style=atom'
-  > process(hgweb(b'.', name = b'repo'))
+  > process(hgweb.hgweb(b'.', name = b'repo'))
   > 
   > output = stringio()
   > env['PATH_INFO'] = '/file/tip/'
   > env['QUERY_STRING'] = 'style=raw'
-  > process(hgweb(b'.', name = b'repo'))
+  > process(hgweb.hgweb(b'.', name = b'repo'))
   > 
   > output = stringio()
   > env['PATH_INFO'] = '/'
   > env['QUERY_STRING'] = 'style=raw'
-  > process(hgwebdir({b'repo': b'.'}))
+  > process(hgweb.hgwebdir({b'repo': b'.'}))
   > 
   > output = stringio()
   > env['PATH_INFO'] = '/repo/file/tip/'
   > env['QUERY_STRING'] = 'style=raw'
-  > process(hgwebdir({b'repo': b'.'}))
+  > process(hgweb.hgwebdir({b'repo': b'.'}))
   > EOF
   $ "$PYTHON" request.py
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'application/atom+xml; charset=ascii')]
   ---- DATA
   <?xml version="1.0" encoding="ascii"?>
   <feed xmlns="http://www.w3.org/2005/Atom">
    <!-- Changelog -->
    <id>http://$LOCALIP:$HGPORT/</id> (glob)
    <link rel="self" href="http://$LOCALIP:$HGPORT/atom-log"/> (glob)
    <link rel="alternate" href="http://$LOCALIP:$HGPORT/"/> (glob)
    <title>repo Changelog</title>
    <updated>1970-01-01T00:00:00+00:00</updated>
   
    <entry>
     <title>[default] test</title>
     <id>http://$LOCALIP:$HGPORT/#changeset-61c9426e69fef294feed5e2bbfc97d39944a5b1c</id> (glob)
     <link href="http://$LOCALIP:$HGPORT/rev/61c9426e69fe"/> (glob)
     <author>
      <name>test</name>
      <email>&#116;&#101;&#115;&#116;</email>
     </author>
     <updated>1970-01-01T00:00:00+00:00</updated>
     <published>1970-01-01T00:00:00+00:00</published>
     <content type="xhtml">
      <table xmlns="http://www.w3.org/1999/xhtml">
       <tr>
        <th style="text-align:left;">changeset</th>
        <td>61c9426e69fe</td>
       </tr>
       <tr>
        <th style="text-align:left;">branch</th>
        <td>default</td>
       </tr>
       <tr>
        <th style="text-align:left;">bookmark</th>
        <td></td>
       </tr>
       <tr>
        <th style="text-align:left;">tag</th>
        <td>tip</td>
       </tr>
       <tr>
        <th style="text-align:left;">user</th>
        <td>&#116;&#101;&#115;&#116;</td>
       </tr>
       <tr>
        <th style="text-align:left;vertical-align:top;">description</th>
        <td>test</td>
       </tr>
       <tr>
        <th style="text-align:left;vertical-align:top;">files</th>
        <td>bar<br /></td>
       </tr>
      </table>
     </content>
    </entry>
   
   </feed>
   ---- ERRORS
   
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'text/plain; charset=ascii')]
   ---- DATA
   
   -rw-r--r-- 4 bar
   
   
   ---- ERRORS
   
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'text/plain; charset=ascii')]
   ---- DATA
   
   /repo/
   
   ---- ERRORS
   
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'text/plain; charset=ascii')]
   ---- DATA
   
   -rw-r--r-- 4 bar
   
   
   ---- ERRORS
   
 
   $ cd ..

tests/test-hgweb-non-interactive.t

@@ -1,96 +1,94 b''
 Tests if hgweb can run without touching sys.stdin, as is required
 by the WSGI standard and strictly implemented by mod_wsgi.
 
   $ hg init repo
   $ cd repo
   $ echo foo > bar
   $ hg add bar
   $ hg commit -m "test"
   $ cat > request.py <<EOF
   > from __future__ import absolute_import
   > import os
   > import sys
   > from mercurial import (
   >     dispatch,
   >     encoding,
   >     hg,
   >     pycompat,
   >     ui as uimod,
   >     util,
   > )
   > ui = uimod.ui
-  > from mercurial.hgweb.hgweb_mod import (
-  >     hgweb,
-  > )
+  > from mercurial.hgweb import hgweb_mod
   > stringio = util.stringio
   > 
   > class FileLike(object):
   >     def __init__(self, real):
   >         self.real = real
   >     def fileno(self):
   >         print >> sys.__stdout__, 'FILENO'
   >         return self.real.fileno()
   >     def read(self):
   >         print >> sys.__stdout__, 'READ'
   >         return self.real.read()
   >     def readline(self):
   >         print >> sys.__stdout__, 'READLINE'
   >         return self.real.readline()
   > 
   > sys.stdin = FileLike(sys.stdin)
   > errors = stringio()
   > input = stringio()
   > output = stringio()
   > 
   > def startrsp(status, headers):
   >     print('---- STATUS')
   >     print(status)
   >     print('---- HEADERS')
   >     print([i for i in headers if i[0] != 'ETag'])
   >     print('---- DATA')
   >     return output.write
   > 
   > env = {
   >     'wsgi.version': (1, 0),
   >     'wsgi.url_scheme': 'http',
   >     'wsgi.errors': errors,
   >     'wsgi.input': input,
   >     'wsgi.multithread': False,
   >     'wsgi.multiprocess': False,
   >     'wsgi.run_once': False,
   >     'REQUEST_METHOD': 'GET',
   >     'SCRIPT_NAME': '',
   >     'PATH_INFO': '',
   >     'QUERY_STRING': '',
   >     'SERVER_NAME': '$LOCALIP',
   >     'SERVER_PORT': os.environ['HGPORT'],
   >     'SERVER_PROTOCOL': 'HTTP/1.0'
   > }
   > 
-  > i = hgweb(b'.')
+  > i = hgweb_mod.hgweb(b'.')
   > for c in i(env, startrsp):
   >     pass
   > sys.stdout.flush()
   > pycompat.stdout.write(b'---- ERRORS\n')
   > pycompat.stdout.write(b'%s\n' % errors.getvalue())
   > print('---- OS.ENVIRON wsgi variables')
   > print(sorted([x for x in os.environ if x.startswith('wsgi')]))
   > print('---- request.ENVIRON wsgi variables')
   > with i._obtainrepo() as repo:
   >     print(sorted([encoding.strfromlocal(x) for x in repo.ui.environ
   >                   if x.startswith(b'wsgi')]))
   > EOF
   $ "$PYTHON" request.py
   ---- STATUS
   200 Script output follows
   ---- HEADERS
   [('Content-Type', 'text/html; charset=ascii')]
   ---- DATA
   ---- ERRORS
   
   ---- OS.ENVIRON wsgi variables
   []
   ---- request.ENVIRON wsgi variables
   ['wsgi.errors', 'wsgi.input', 'wsgi.multiprocess', 'wsgi.multithread', 'wsgi.run_once', 'wsgi.url_scheme', 'wsgi.version']
 
   $ cd ..