Mercurial > public > mercurial-scm > hg-stable
diff mercurial/hgweb/__init__.py @ 43076:2372284d9457
formatting: blacken the codebase
This is using my patch to black
(https://github.com/psf/black/pull/826) so we don't un-wrap collection
literals.
Done with:
hg files 'set:**.py - mercurial/thirdparty/** - "contrib/python-zstandard/**"' | xargs black -S
# skip-blame mass-reformatting only
# no-check-commit reformats foo_bar functions
Differential Revision: https://phab.mercurial-scm.org/D6971
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 06 Oct 2019 09:45:02 -0400 |
| parents | 91104f10ff65 |
| children | 687b865b95ad |
line wrap: on
line diff
--- a/mercurial/hgweb/__init__.py Sat Oct 05 10:29:34 2019 -0400 +++ b/mercurial/hgweb/__init__.py Sun Oct 06 09:45:02 2019 -0400 @@ -17,9 +17,7 @@ pycompat, ) -from ..utils import ( - procutil, -) +from ..utils import procutil from . import ( hgweb_mod, @@ -27,6 +25,7 @@ server, ) + def hgweb(config, name=None, baseui=None): '''create an hgweb wsgi object @@ -40,16 +39,22 @@ if isinstance(config, pycompat.unicode): raise error.ProgrammingError( - 'Mercurial only supports encoded strings: %r' % config) - if ((isinstance(config, bytes) and not os.path.isdir(config)) or - isinstance(config, dict) or isinstance(config, list)): + 'Mercurial only supports encoded strings: %r' % config + ) + if ( + (isinstance(config, bytes) and not os.path.isdir(config)) + or isinstance(config, dict) + or isinstance(config, list) + ): # create a multi-dir interface return hgwebdir_mod.hgwebdir(config, baseui=baseui) return hgweb_mod.hgweb(config, name=name, baseui=baseui) + def hgwebdir(config, baseui=None): return hgwebdir_mod.hgwebdir(config, baseui=baseui) + class httpservice(object): def __init__(self, ui, app, opts): self.ui = ui @@ -60,9 +65,11 @@ procutil.setsignalhandler() self.httpd = server.create_server(self.ui, self.app) - if (self.opts['port'] and - not self.ui.verbose and - not self.opts['print_url']): + if ( + self.opts['port'] + and not self.ui.verbose + and not self.opts['print_url'] + ): return if self.httpd.prefix: @@ -77,7 +84,7 @@ bindaddr = self.httpd.addr if bindaddr == r'0.0.0.0': bindaddr = r'*' - elif r':' in bindaddr: # IPv6 + elif r':' in bindaddr: # IPv6 bindaddr = r'[%s]' % bindaddr fqaddr = self.httpd.fqaddr @@ -85,7 +92,10 @@ fqaddr = r'[%s]' % fqaddr url = 'http://%s%s/%s' % ( - pycompat.sysbytes(fqaddr), pycompat.sysbytes(port), prefix) + pycompat.sysbytes(fqaddr), + pycompat.sysbytes(port), + prefix, + ) if self.opts['print_url']: self.ui.write('%s\n' % url) else: @@ -93,18 +103,22 @@ write = self.ui.status else: write = self.ui.write - write(_('listening at %s (bound to %s:%d)\n') % - (url, pycompat.sysbytes(bindaddr), self.httpd.port)) + write( + _('listening at %s (bound to %s:%d)\n') + % (url, pycompat.sysbytes(bindaddr), self.httpd.port) + ) self.ui.flush() # avoid buffering of status message def run(self): self.httpd.serve_forever() + def createapp(baseui, repo, webconf): if webconf: return hgwebdir_mod.hgwebdir(webconf, baseui=baseui) else: if not repo: - raise error.RepoError(_("there is no Mercurial repository" - " here (.hg not found)")) + raise error.RepoError( + _("there is no Mercurial repository" " here (.hg not found)") + ) return hgweb_mod.hgweb(repo, baseui=baseui)