upstream/mercurial-mirror Files · mercurial/hgweb/wsgicgi.py

templater: take any string literals as template, but not for rawstring (BC)...

templater: take any string literals as template, but not for rawstring (BC) This patch series is intended to unify the interpretation of string literals. It is breaking change that boldly assumes a. string literal "..." never contains template-like fragment or it is intended to be a template b. we tend to use raw string literal r"..." for regexp pattern in which "{" should have different meaning Currently, we don't have a comprehensible rule how string literals are evaluated in template functions. For example, fill() takes "initialindent" and "hangindent" as templates, but not for "text", whereas "text" is a template in pad() function. date(date, fmt) diff(includepattern, excludepattern) fill(text, width, initialident: T, hangindent: T) get(dict, key) if(expr, then: T, else: T) ifcontains(search, thing, then: T, else: T) ifeq(expr1, expr2, then: T, else: T) indent(text, indentchars, firstline) join(list, sep) label(label: T, expr: T) pad(text: T, width, fillchar, right) revset(query, formatargs...]) rstdoc(text, style) shortest(node, minlength) startswith(pattern, text) strip(text, chars) sub(pattern, replacement, expression: T) word(number, text, separator) expr % template: T T: interpret "string" or r"rawstring" as template This patch series adjusts the rule as follows: a. string literal, '' or "", starts template processing (BC) b. raw string literal, r'' or r"", disables both \-escape and template processing (BC, done by subsequent patches) c. fragment not surrounded by {} is non-templated string "ccc{'aaa'}{r'bbb'}" ------------------ *: template --- c: string --- a: template --- b: rawstring Because this can eliminate the compilation of template arguments from the evaluation phase, "hg log -Tdefault" gets faster. % cd mozilla-central % LANG=C HGRCPATH=/dev/null hg log -Tdefault -r0:10000 --time > /dev/null before: real 4.870 secs (user 4.860+0.000 sys 0.010+0.000) after: real 3.480 secs (user 3.440+0.000 sys 0.030+0.000) Also, this will allow us to parse nested templates at once for better error indication.

Mads Kiilerich - - Load All Authors

File last commit:

r18552:e8efcc8f stable


                r25596:c1975809

default

Download file

             wsgicgi.py
        
                    83 lines
            
             | 2.7 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / hgweb / wsgicgi.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # hgweb/wsgicgi.py - CGI->WSGI translator

      #

      # Copyright 2006 Eric Hopper <hopper@omnifarious.org>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      #

      # This was originally copied from the public domain code at

      # http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side

      import os, sys

      from mercurial import util

      from mercurial.hgweb import common

      def launch(application):

          util.setbinary(sys.stdin)

          util.setbinary(sys.stdout)

          environ = dict(os.environ.iteritems())

          environ.setdefault('PATH_INFO', '')

          if environ.get('SERVER_SOFTWARE', '').startswith('Microsoft-IIS'):

              # IIS includes script_name in PATH_INFO

              scriptname = environ['SCRIPT_NAME']

              if environ['PATH_INFO'].startswith(scriptname):

                  environ['PATH_INFO'] = environ['PATH_INFO'][len(scriptname):]

          stdin = sys.stdin

          if environ.get('HTTP_EXPECT', '').lower() == '100-continue':

              stdin = common.continuereader(stdin, sys.stdout.write)

          environ['wsgi.input'] = stdin

          environ['wsgi.errors'] = sys.stderr

          environ['wsgi.version'] = (1, 0)

          environ['wsgi.multithread'] = False

          environ['wsgi.multiprocess'] = True

          environ['wsgi.run_once'] = True

          if environ.get('HTTPS', 'off').lower() in ('on', '1', 'yes'):

              environ['wsgi.url_scheme'] = 'https'

          else:

              environ['wsgi.url_scheme'] = 'http'

          headers_set = []

          headers_sent = []

          out = sys.stdout

          def write(data):

              if not headers_set:

                  raise AssertionError("write() before start_response()")

              elif not headers_sent:

                  # Before the first output, send the stored headers

                  status, response_headers = headers_sent[:] = headers_set

                  out.write('Status: %s\r\n' % status)

                  for header in response_headers:

                      out.write('%s: %s\r\n' % header)

                  out.write('\r\n')

              out.write(data)

              out.flush()

          def start_response(status, response_headers, exc_info=None):

              if exc_info:

                  try:

                      if headers_sent:

                          # Re-raise original exception if headers sent

                          raise exc_info[0](exc_info[1], exc_info[2])

                  finally:

                      exc_info = None     # avoid dangling circular ref

              elif headers_set:

                  raise AssertionError("Headers already set!")

              headers_set[:] = [status, response_headers]

              return write

          content = application(environ, start_response)

          try:

              for chunk in content:

                  write(chunk)

              if not headers_sent:

                  write('')   # send headers now if body was empty

          finally:

              getattr(content, 'close', lambda : None)()

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# hgweb/wsgicgi.py - CGI->WSGI translator
				#
				# Copyright 2006 Eric Hopper <hopper@omnifarious.org>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.
				#
				# This was originally copied from the public domain code at
				# http://www.python.org/dev/peps/pep-0333/#the-server-gateway-side

				import os, sys
				from mercurial import util
				from mercurial.hgweb import common

				def launch(application):
				util.setbinary(sys.stdin)
				util.setbinary(sys.stdout)

				environ = dict(os.environ.iteritems())
				environ.setdefault('PATH_INFO', '')
				if environ.get('SERVER_SOFTWARE', '').startswith('Microsoft-IIS'):
				# IIS includes script_name in PATH_INFO
				scriptname = environ['SCRIPT_NAME']
				if environ['PATH_INFO'].startswith(scriptname):
				environ['PATH_INFO'] = environ['PATH_INFO'][len(scriptname):]

				stdin = sys.stdin
				if environ.get('HTTP_EXPECT', '').lower() == '100-continue':
				stdin = common.continuereader(stdin, sys.stdout.write)

				environ['wsgi.input'] = stdin
				environ['wsgi.errors'] = sys.stderr
				environ['wsgi.version'] = (1, 0)
				environ['wsgi.multithread'] = False
				environ['wsgi.multiprocess'] = True
				environ['wsgi.run_once'] = True

				if environ.get('HTTPS', 'off').lower() in ('on', '1', 'yes'):
				environ['wsgi.url_scheme'] = 'https'
				else:
				environ['wsgi.url_scheme'] = 'http'

				headers_set = []
				headers_sent = []
				out = sys.stdout

				def write(data):
				if not headers_set:
				raise AssertionError("write() before start_response()")

				elif not headers_sent:
				# Before the first output, send the stored headers
				status, response_headers = headers_sent[:] = headers_set
				out.write('Status: %s\r\n' % status)
				for header in response_headers:
				out.write('%s: %s\r\n' % header)
				out.write('\r\n')

				out.write(data)
				out.flush()

				def start_response(status, response_headers, exc_info=None):
				if exc_info:
				try:
				if headers_sent:
				# Re-raise original exception if headers sent
				raise exc_info[0](exc_info[1], exc_info[2])
				finally:
				exc_info = None # avoid dangling circular ref
				elif headers_set:
				raise AssertionError("Headers already set!")

				headers_set[:] = [status, response_headers]
				return write

				content = application(environ, start_response)
				try:
				for chunk in content:
				write(chunk)
				if not headers_sent:
				write('') # send headers now if body was empty
				finally:
				getattr(content, 'close', lambda : None)()