This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	marmoute	D11312 resources: narrow the try:except clause to minimum
Closed	marmoute	D11311 resources: stop important a non existent FileNotFoundError
Closed	marmoute	D11310 template: FileNotFoundError is actually a built in exception
Closed	marmoute	D11309 check-code: drop the camelcase checks

Diff 29959

	import SocketServer as socketserver			import SocketServer as socketserver
	import xmlrpclib			import xmlrpclib

	from .thirdparty.concurrent import futures			from .thirdparty.concurrent import futures

	def future_set_exception_info(f, exc_info):			def future_set_exception_info(f, exc_info):
	f.set_exception_info(*exc_info)			f.set_exception_info(*exc_info)

				# this is close enough for our usage
				FileNotFoundError = OSError

	else:			else:
	import concurrent.futures as futures			import concurrent.futures as futures
	import http.cookiejar as cookielib			import http.cookiejar as cookielib
	import http.client as httplib			import http.client as httplib
	import pickle			import pickle
	import queue as queue			import queue as queue
	import socketserver			import socketserver
	import xmlrpc.client as xmlrpclib			import xmlrpc.client as xmlrpclib

	def future_set_exception_info(f, exc_info):			def future_set_exception_info(f, exc_info):
	f.set_exception(exc_info[0])			f.set_exception(exc_info[0])

				FileNotFoundError = __builtins__['FileNotFoundError']


	def identity(a):			def identity(a):
	return a			return a


	def _rapply(f, xs):			def _rapply(f, xs):
	if xs is None:			if xs is None:
	# assume None means non-value of optional data			# assume None means non-value of optional data

	"""			"""

	from __future__ import absolute_import, print_function			from __future__ import absolute_import, print_function

	import abc			import abc
	import os			import os

	from .i18n import _			from .i18n import _
	from .pycompat import getattr			from .pycompat import (
				FileNotFoundError,
				getattr,
				)
	from . import (			from . import (
	config,			config,
	encoding,			encoding,
	error,			error,
	parser,			parser,
	pycompat,			pycompat,
	templatefilters,			templatefilters,
	templatefuncs,			templatefuncs,
	subresource = util.posixfile(abs, b'rb')			subresource = util.posixfile(abs, b'rb')
	if not subresource:			if not subresource:
	if pycompat.ossep not in rel:			if pycompat.ossep not in rel:
	abs = rel			abs = rel
	try:			try:
	subresource = resourceutil.open_resource(			subresource = resourceutil.open_resource(
	b'mercurial.templates', rel			b'mercurial.templates', rel
	)			)
	except resourceutil.FileNotFoundError:			except FileNotFoundError:
	subresource = None			subresource = None
	else:			else:
	dir = templatedir()			dir = templatedir()
	if dir:			if dir:
	abs = os.path.normpath(os.path.join(dir, rel))			abs = os.path.normpath(os.path.join(dir, rel))
	if os.path.isfile(abs):			if os.path.isfile(abs):
	subresource = util.posixfile(abs, b'rb')			subresource = util.posixfile(abs, b'rb')
	if subresource:			if subresource: