Commit bce9bebc84b185f8b3c8bdb087efbc470eb33200 - cherrypy3

+3

-0

.gitignore less more

22	22
23	23	# Ignore useless OS X's dirs:
24	24	.DS_Store
	25
	26	# Py.test
	27	/.cache/

+12

-2

.travis.yml less more

4	4	- 3.3
5	5	- 3.4
6	6	- 3.5
7		- 3.6-dev
	7	- 3.6
8	8	- pypy
9	9	- pypy3
10	10	- nightly

20	20	include:
21	21	- python: 3.5
22	22	env: TOXENV=pre-commit
23		include:
24	23	- python: 3.5
25	24	env: TOXENV=dist-check
26	25

28	27
29	28	install: pip install tox
30	29	script: tox
	30
	31	after_failure: >
	32	if [[ "$TOXENV" != "pre-commit" ]]
	33	then
	34	echo Dumping logs, because tests failed to succeed
	35	for log in `ls cherrypy/test/*.log`
	36	do
	37	echo Outputting $log
	38	cat $log
	39	done
	40	fi
31	41
32	42	deploy:
33	43	provider: pypi

+16

-0

CHANGES.rst less more

	0	v8.9.1
	1	-----
	2
	3	* #1537: Restore dependency on pywin32 for Python 3.6.
	4
	5	v8.9.0
	6	-----
	7
	8	* #1547: Replaced ``cherryd`` distutils script with a setuptools
	9	console entry point.
	10
	11	When running CherryPy in daemon mode, the forked process no
	12	longer changes directory to ``/``. If that behavior is something
	13	on which your application relied and should rely, please file
	14	a ticket with the project.
	15
0	16	v8.8.0
1	17	-----
2	18

+4

-4

CherryPy.egg-info/PKG-INFO less more

0	0	Metadata-Version: 1.1
1	1	Name: CherryPy
2		Version: 8.8.0
	2	Version: 8.9.1
3	3	Summary: Object-Oriented HTTP framework
4	4	Home-page: http://www.cherrypy.org
5	5	Author: CherryPy Team

11	11	.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
12	12	:target: http://docs.cherrypy.org/en/latest/?badge=latest
13	13
14		.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
	14	.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=Linux%20build%20%40%20Travis%20CI
15	15	:target: http://travis-ci.org/cherrypy/cherrypy
16	16
17		.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
18		:target: https://ci.appveyor.com/project/jaraco/cherrypy
	17	.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy/master.svg?label=Windows%20build%20%40%20Appveyor
	18	:target: https://ci.appveyor.com/project/jaraco/cherrypy/branch/master
19	19
20	20	.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
21	21

+1

-1

CherryPy.egg-info/SOURCES.txt less more

12	12	CherryPy.egg-info/PKG-INFO
13	13	CherryPy.egg-info/SOURCES.txt
14	14	CherryPy.egg-info/dependency_links.txt
	15	CherryPy.egg-info/entry_points.txt
15	16	CherryPy.egg-info/requires.txt
16	17	CherryPy.egg-info/top_level.txt
17	18	cherrypy/__init__.py

32	33	cherrypy/_cpwsgi.py
33	34	cherrypy/_cpwsgi_server.py
34	35	cherrypy/_helper.py
35		cherrypy/cherryd
36	36	cherrypy/daemon.py
37	37	cherrypy/favicon.ico
38	38	cherrypy/lib/__init__.py

+3

-0

CherryPy.egg-info/entry_points.txt less more

	0	[console_scripts]
	1	cherryd = cherrypy.__main__:run
	2

+1

-1

CherryPy.egg-info/requires.txt less more

0	0	six
1	1
2		[:sys_platform == "win32" and python_version != "3.6"]
	2	[:sys_platform == "win32"]
3	3	pypiwin32
4	4
5	5	[doc]

+4

-4

PKG-INFO less more

0	0	Metadata-Version: 1.1
1	1	Name: CherryPy
2		Version: 8.8.0
	2	Version: 8.9.1
3	3	Summary: Object-Oriented HTTP framework
4	4	Home-page: http://www.cherrypy.org
5	5	Author: CherryPy Team

11	11	.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
12	12	:target: http://docs.cherrypy.org/en/latest/?badge=latest
13	13
14		.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
	14	.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=Linux%20build%20%40%20Travis%20CI
15	15	:target: http://travis-ci.org/cherrypy/cherrypy
16	16
17		.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
18		:target: https://ci.appveyor.com/project/jaraco/cherrypy
	17	.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy/master.svg?label=Windows%20build%20%40%20Appveyor
	18	:target: https://ci.appveyor.com/project/jaraco/cherrypy/branch/master
19	19
20	20	.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
21	21

+3

-3

README.rst less more

3	3	.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
4	4	:target: http://docs.cherrypy.org/en/latest/?badge=latest
5	5
6		.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
	6	.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=Linux%20build%20%40%20Travis%20CI
7	7	:target: http://travis-ci.org/cherrypy/cherrypy
8	8
9		.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
10		:target: https://ci.appveyor.com/project/jaraco/cherrypy
	9	.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy/master.svg?label=Windows%20build%20%40%20Appveyor
	10	:target: https://ci.appveyor.com/project/jaraco/cherrypy/branch/master
11	11
12	12	.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
13	13

+3

-2

cherrypy/__main__.py less more

0		import cherrypy.daemon
	0	from cherrypy.daemon import run
	1
1	2
2	3	if __name__ == '__main__':
3		cherrypy.daemon.run()
	4	run()

+0

-6

~~cherrypy/cherryd~~ less more

0		#! /usr/bin/env python
1
2		import cherrypy.daemon
3
4		if __name__ == '__main__':
5		cherrypy.daemon.run()

+0

-1

cherrypy/process/plugins.py less more

408	408	sys.exit('%s: fork #2 failed: (%d) %s\n'
409	409	% (sys.argv[0], exc.errno, exc.strerror))
410	410
411		os.chdir('/')
412	411	os.umask(0)
413	412
414	413	si = open(self.stdin, 'r')

+52

-1

cherrypy/process/wspbus.py less more

446	446	argc = ctypes.c_int()
447	447
448	448	ctypes.pythonapi.Py_GetArgcArgv(ctypes.byref(argc), ctypes.byref(argv))
	449
	450	_argv = argv[:argc.value]
	451
	452	# The code below is trying to correctly handle special cases.
	453	# `-c`'s argument interpreted by Python itself becomes `-c` as
	454	# well. Same applies to `-m`. This snippet is trying to survive
	455	# at least the case with `-m`
	456	# Ref: https://github.com/cherrypy/cherrypy/issues/1545
	457	# Ref: python/cpython@418baf9
	458	argv_len, is_command, is_module = len(_argv), False, False
	459
	460	try:
	461	m_ind = _argv.index('-m')
	462	if m_ind < argv_len - 1 and _argv[m_ind + 1] in ('-c', '-m'):
	463	"""
	464	In some older Python versions `-m`'s argument may be
	465	substituted with `-c`, not `-m`
	466	"""
	467	is_module = True
	468	except (IndexError, ValueError):
	469	m_ind = None
	470
	471	try:
	472	c_ind = _argv.index('-c')
	473	if m_ind < argv_len - 1 and _argv[c_ind + 1] == '-c':
	474	is_command = True
	475	except (IndexError, ValueError):
	476	c_ind = None
	477
	478	if is_module:
	479	"""It's containing `-m -m` sequence of arguments"""
	480	if is_command and c_ind < m_ind:
	481	"""There's `-c -c` before `-m`"""
	482	raise RuntimeError(
	483	"Cannot reconstruct command from '-c'. Ref: "
	484	'https://github.com/cherrypy/cherrypy/issues/1545')
	485	# Survive module argument here
	486	original_module = sys.argv[0]
	487	if not os.access(original_module, os.R_OK):
	488	"""There's no such module exist"""
	489	raise AttributeError(
	490	"{} doesn't seem to be a module "
	491	"accessible by current user".format(original_module))
	492	del _argv[m_ind:m_ind + 2] # remove `-m -m`
	493	# ... and substitute it with the original module path:
	494	_argv.insert(m_ind, original_module)
	495	elif is_command:
	496	"""It's containing just `-c -c` sequence of arguments"""
	497	raise RuntimeError(
	498	"Cannot reconstruct command from '-c'. "
	499	'Ref: https://github.com/cherrypy/cherrypy/issues/1545')
449	500	except AttributeError:
450	501	"""It looks Py_GetArgcArgv is completely absent in some environments
451	502

458	509	"""
459	510	raise NotImplementedError
460	511	else:
461		return argv[:argc.value]
	512	return _argv
462	513
463	514	@staticmethod
464	515	def _extend_pythonpath(env):

+1

-1

cherrypy/scaffold/__init__.py less more

7	7	Even before any tweaking, this should serve a few demonstration pages.
8	8	Change to this directory and run:
9	9
10		../cherryd -c site.conf
	10	cherryd -c site.conf
11	11
12	12	"""
13	13

+20

-1

cherrypy/test/helper.py less more

472	472	cherrypy._cpserver.wait_for_free_port(self.host, self.port)
473	473
474	474	args = [
475		os.path.join(thisdir, '..', 'cherryd'),
	475	'-m',
	476	'cherrypy.__main__', # __main__ is needed for `-m` in Python 2.6
476	477	'-c', self.config_file,
477	478	'-p', self.pid_file,
478	479	]
	480	"""
	481	Command for running cherryd server with autoreload enabled
	482
	483	Using
	484
	485	```
	486	['-c',
	487	"__requires__ = 'CherryPy'; \
	488	import pkg_resources, re, sys; \
	489	sys.argv[0] = re.sub(r'(-script\.pyw?\|\.exe)?$', '', sys.argv[0]); \
	490	sys.exit(\
	491	pkg_resources.load_entry_point(\
	492	'CherryPy', 'console_scripts', 'cherryd')())"]
	493	```
	494
	495	doesn't work as it's impossible to reconstruct the `-c`'s contents.
	496	Ref: https://github.com/cherrypy/cherrypy/issues/1545
	497	"""
479	498
480	499	if not isinstance(imports, (list, tuple)):
481	500	imports = [imports]

+2

-4

setup.py less more

58	58	'cherrypy.scaffold',
59	59	'cherrypy.wsgiserver',
60	60	]
61		scripts = ['cherrypy/cherryd']
62	61
63	62	install_requires = [
64	63	'six',

86	85	'xcgi': ['flup'],
87	86
88	87	# http://docs.cherrypy.org/en/latest/advanced.html?highlight=windows#windows-console-events
89		# disabled on Python 3.6 due to #1537
90		':sys_platform == "win32" and python_version != "3.6"': ['pypiwin32'],
	88	':sys_platform == "win32"': ['pypiwin32'],
91	89	}
92	90	"""Feature flags end-users can use in dependencies"""
93	91

106	104	url=url,
107	105	license=cp_license,
108	106	packages=packages,
109		scripts=scripts,
	107	entry_points={"console_scripts": ["cherryd = cherrypy.__main__:run"]},
110	108	include_package_data=True,
111	109	install_requires=install_requires,
112	110	extras_require=extras_require,