[Python-modules-commits] [cherrypy3] 01/08: Import cherrypy3_8.8.0.orig.tar.gz
Carl Suster
arcresu-guest at moszumanska.debian.org
Thu Jan 12 07:35:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
arcresu-guest pushed a commit to branch master
in repository cherrypy3.
commit fa7140228740b12dd04d7b4ed2e76ad92cb43640
Author: Carl Suster <carl at contraflo.ws>
Date: Thu Jan 12 17:59:09 2017 +1100
Import cherrypy3_8.8.0.orig.tar.gz
---
CHANGES.rst | 5 +++++
CherryPy.egg-info/PKG-INFO | 7 +++++--
CherryPy.egg-info/SOURCES.txt | 3 ++-
PKG-INFO | 7 +++++--
README.rst | 5 ++++-
appveyor.yml | 19 +++++++++++++++++++
cherrypy/test/static/index.html | 2 +-
cherrypy/test/test_core.py | 6 +++++-
cherrypy/test/test_static.py | 8 ++++++--
cherrypy/test/test_wsgi_unix_socket.py | 22 +++-------------------
cherrypy/test/webtest.py | 2 +-
cherrypy/tutorial/README.rst | 16 ++++++++++++++++
cherrypy/tutorial/README.txt | 15 ---------------
cherrypy/tutorial/tutorial.conf | 8 ++++----
cherrypy/wsgiserver/__init__.py | 2 +-
setup.cfg | 2 +-
16 files changed, 78 insertions(+), 51 deletions(-)
diff --git a/CHANGES.rst b/CHANGES.rst
index 4c9b1d8..9c484b4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+v8.8.0
+-----
+
+* #1528: Allow a timeout of 0 to server.
+
v8.7.0
-----
diff --git a/CherryPy.egg-info/PKG-INFO b/CherryPy.egg-info/PKG-INFO
index fc866f6..911941e 100644
--- a/CherryPy.egg-info/PKG-INFO
+++ b/CherryPy.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: CherryPy
-Version: 8.7.0
+Version: 8.8.0
Summary: Object-Oriented HTTP framework
Home-page: http://www.cherrypy.org
Author: CherryPy Team
@@ -12,9 +12,12 @@ Description: .. image:: https://img.shields.io/pypi/v/cherrypy.svg
.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
:target: http://docs.cherrypy.org/en/latest/?badge=latest
- .. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg
+ .. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
:target: http://travis-ci.org/cherrypy/cherrypy
+ .. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
+ :target: https://ci.appveyor.com/project/jaraco/cherrypy
+
.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
.. image:: https://img.shields.io/pypi/dm/cherrypy.svg
diff --git a/CherryPy.egg-info/SOURCES.txt b/CherryPy.egg-info/SOURCES.txt
index d266591..5340df4 100644
--- a/CherryPy.egg-info/SOURCES.txt
+++ b/CherryPy.egg-info/SOURCES.txt
@@ -6,6 +6,7 @@ CHANGES.rst
CONTRIBUTING.rst
LICENSE.md
README.rst
+appveyor.yml
setup.cfg
setup.py
tox.ini
@@ -123,7 +124,7 @@ cherrypy/test/webtest.py
cherrypy/test/static/404.html
cherrypy/test/static/dirback.jpg
cherrypy/test/static/index.html
-cherrypy/tutorial/README.txt
+cherrypy/tutorial/README.rst
cherrypy/tutorial/__init__.py
cherrypy/tutorial/custom_error.html
cherrypy/tutorial/pdf_file.pdf
diff --git a/PKG-INFO b/PKG-INFO
index fc866f6..911941e 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: CherryPy
-Version: 8.7.0
+Version: 8.8.0
Summary: Object-Oriented HTTP framework
Home-page: http://www.cherrypy.org
Author: CherryPy Team
@@ -12,9 +12,12 @@ Description: .. image:: https://img.shields.io/pypi/v/cherrypy.svg
.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
:target: http://docs.cherrypy.org/en/latest/?badge=latest
- .. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg
+ .. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
:target: http://travis-ci.org/cherrypy/cherrypy
+ .. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
+ :target: https://ci.appveyor.com/project/jaraco/cherrypy
+
.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
.. image:: https://img.shields.io/pypi/dm/cherrypy.svg
diff --git a/README.rst b/README.rst
index 19721c6..f3e9f43 100644
--- a/README.rst
+++ b/README.rst
@@ -4,9 +4,12 @@
.. image:: https://readthedocs.org/projects/cherrypy/badge/?version=latest
:target: http://docs.cherrypy.org/en/latest/?badge=latest
-.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg
+.. image:: https://img.shields.io/travis/cherrypy/cherrypy/master.svg?label=*NIX%20build%20%40%20Travis%20CI
:target: http://travis-ci.org/cherrypy/cherrypy
+.. image:: https://img.shields.io/appveyor/ci/jaraco/cherrypy.svg?label=Windows%20build%20%40%20Travis%20CI
+ :target: https://ci.appveyor.com/project/jaraco/cherrypy
+
.. image:: https://img.shields.io/pypi/pyversions/cherrypy.svg
.. image:: https://img.shields.io/pypi/dm/cherrypy.svg
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..97bb9b8
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+environment:
+
+ APPVEYOR: true
+
+ matrix:
+ - PYTHON: "C:\\Python35-x64"
+ - PYTHON: "C:\\Python27-x64"
+
+install:
+ # symlink python from a directory with a space
+ - "mklink /d \"C:\\Program Files\\Python\" %PYTHON%"
+ - "SET PYTHON=\"C:\\Program Files\\Python\""
+ - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
+
+build: off
+
+test_script:
+ - "python -m pip install tox"
+ - "tox"
diff --git a/cherrypy/test/static/index.html b/cherrypy/test/static/index.html
index a5c1966..b9f5f09 100644
--- a/cherrypy/test/static/index.html
+++ b/cherrypy/test/static/index.html
@@ -1 +1 @@
-Hello, world
+Hello, world
diff --git a/cherrypy/test/test_core.py b/cherrypy/test/test_core.py
index a104216..cb728d8 100644
--- a/cherrypy/test/test_core.py
+++ b/cherrypy/test/test_core.py
@@ -756,7 +756,11 @@ class ErrorTests(helper.CPWebCase):
def test_contextmanager(self):
self.getPage('/stat/missing')
self.assertStatus(404)
- self.assertInBody('No such file or directory')
+ body_text = self.body.decode('utf-8')
+ assert (
+ 'No such file or directory' in body_text or
+ 'cannot find the file specified' in body_text
+ )
class TestBinding:
diff --git a/cherrypy/test/test_static.py b/cherrypy/test/test_static.py
index 19422cd..f866365 100644
--- a/cherrypy/test/test_static.py
+++ b/cherrypy/test/test_static.py
@@ -241,8 +241,7 @@ class StaticTest(helper.CPWebCase):
self.assertHeader('Content-Length', 14)
self.assertMatchesBody('Fee\nfie\nfo\nfum')
- @pytest.mark.xfail(platform.system() == 'Darwin',
- reason='#1475')
+ @pytest.mark.xfail(reason='#1475')
def test_file_stream(self):
if cherrypy.server.protocol_version != 'HTTP/1.1':
return self.skip()
@@ -371,6 +370,11 @@ class StaticTest(helper.CPWebCase):
finally:
os.remove(filepath)
+ py27_on_windows = (
+ platform.system() == 'Windows' and
+ sys.version_info < (3,)
+ )
+ @pytest.mark.xfail(py27_on_windows, reason="#1544")
def test_unicode(self):
with self.unicode_file():
url = ntou('/static/Слава Україні.html', 'utf-8')
diff --git a/cherrypy/test/test_wsgi_unix_socket.py b/cherrypy/test/test_wsgi_unix_socket.py
index 57d7a54..1f8a41e 100644
--- a/cherrypy/test/test_wsgi_unix_socket.py
+++ b/cherrypy/test/test_wsgi_unix_socket.py
@@ -1,9 +1,10 @@
import os
-import sys
import socket
import atexit
import tempfile
+import pytest
+
import cherrypy
from cherrypy.test import helper
from cherrypy._cpcompat import HTTPConnection
@@ -42,21 +43,7 @@ class USocketHTTPConnection(HTTPConnection):
atexit.register(lambda: os.remove(self.path))
-def skip_on_windows(method):
- """
- Decorator to skip the method call if the test is executing on Windows.
- """
- def wrapper(self):
- if sys.platform == 'win32':
- return self.skip('No UNIX Socket support in Windows.')
- else:
- return method(self)
- wrapper.__doc__ = method.__doc__
- wrapper.__name__ = method.__name__
- return wrapper
-
-
-
+ at pytest.mark.skipif("sys.platform == 'win32'")
class WSGI_UnixSocket_Test(helper.CPWebCase):
"""
Test basic behavior on a cherrypy wsgi server listening
@@ -88,18 +75,15 @@ class WSGI_UnixSocket_Test(helper.CPWebCase):
def tearDown(self):
cherrypy.config.update({'server.socket_file': None})
- @skip_on_windows
def test_simple_request(self):
self.getPage('/')
self.assertStatus('200 OK')
self.assertInBody('Test OK')
- @skip_on_windows
def test_not_found(self):
self.getPage('/invalid_path')
self.assertStatus('404 Not Found')
- @skip_on_windows
def test_internal_error(self):
self.getPage('/error')
self.assertStatus('500 Internal Server Error')
diff --git a/cherrypy/test/webtest.py b/cherrypy/test/webtest.py
index d7447d1..06b6fae 100644
--- a/cherrypy/test/webtest.py
+++ b/cherrypy/test/webtest.py
@@ -462,7 +462,7 @@ class WebCase(unittest.TestCase):
self._handlewebError(msg)
-methods_with_bodies = ('POST', 'PUT')
+methods_with_bodies = ('POST', 'PUT', 'PATCH')
def cleanHeaders(headers, method, body, host, port):
diff --git a/cherrypy/tutorial/README.rst b/cherrypy/tutorial/README.rst
new file mode 100644
index 0000000..3c0791b
--- /dev/null
+++ b/cherrypy/tutorial/README.rst
@@ -0,0 +1,16 @@
+CherryPy Tutorials
+------------------------------------------------------------------------
+
+This is a series of tutorials explaining how to develop dynamic web
+applications using CherryPy. A couple of notes:
+
+
+- Each of these tutorials builds on the ones before it. If you're
+ new to CherryPy, we recommend you start with 01_helloworld.py and
+ work your way upwards. :)
+
+- In most of these tutorials, you will notice that all output is done
+ by returning normal Python strings, often using simple Python
+ variable substitution. In most real-world applications, you will
+ probably want to use a separate template package (like Cheetah,
+ CherryTemplate or XML/XSL).
diff --git a/cherrypy/tutorial/README.txt b/cherrypy/tutorial/README.txt
deleted file mode 100644
index 986dbce..0000000
--- a/cherrypy/tutorial/README.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-CherryPy Tutorials
-------------------------------------------------------------------------
-
-This is a series of tutorials explaining how to develop dynamic web
-applications using CherryPy. A couple of notes:
-
- - Each of these tutorials builds on the ones before it. If you're
- new to CherryPy, we recommend you start with 01_helloworld.py and
- work your way upwards. :)
-
- - In most of these tutorials, you will notice that all output is done
- by returning normal Python strings, often using simple Python
- variable substitution. In most real-world applications, you will
- probably want to use a separate template package (like Cheetah,
- CherryTemplate or XML/XSL).
diff --git a/cherrypy/tutorial/tutorial.conf b/cherrypy/tutorial/tutorial.conf
index 43dfa60..6537fd3 100644
--- a/cherrypy/tutorial/tutorial.conf
+++ b/cherrypy/tutorial/tutorial.conf
@@ -1,4 +1,4 @@
-[global]
-server.socket_host = "127.0.0.1"
-server.socket_port = 8080
-server.thread_pool = 10
+[global]
+server.socket_host = "127.0.0.1"
+server.socket_port = 8080
+server.thread_pool = 10
diff --git a/cherrypy/wsgiserver/__init__.py b/cherrypy/wsgiserver/__init__.py
index 7cdf23f..a3ce940 100644
--- a/cherrypy/wsgiserver/__init__.py
+++ b/cherrypy/wsgiserver/__init__.py
@@ -1695,7 +1695,7 @@ class ThreadPool(object):
# Don't join currentThread (when stop is called inside a request).
current = threading.currentThread()
- if timeout and timeout >= 0:
+ if timeout is not None and timeout >= 0:
endtime = time.time() + timeout
while self._threads:
worker = self._threads.pop()
diff --git a/setup.cfg b/setup.cfg
index 8e4b348..c1a9c55 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,6 +6,6 @@ universal = 1
[egg_info]
tag_date = 0
-tag_build =
tag_svn_revision = 0
+tag_build =
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cherrypy3.git
More information about the Python-modules-commits
mailing list