[Python-modules-commits] [webtest] 01/03: Import webtest_2.0.23.orig.tar.gz

Piotr Ożarowski piotr at moszumanska.debian.org
Sat Jul 30 21:51:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

piotr pushed a commit to branch master
in repository webtest.

commit ad92116946d037b6907d2c9a5ec99be509f18a81
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sat Jul 30 23:49:06 2016 +0200

    Import webtest_2.0.23.orig.tar.gz
---
 CHANGELOG.rst                 | 11 +++++++++++
 PKG-INFO                      |  4 ++--
 README.rst                    |  2 +-
 WebTest.egg-info/PKG-INFO     |  4 ++--
 WebTest.egg-info/requires.txt |  2 +-
 docs/conf.py                  |  4 ++--
 setup.cfg                     |  3 +++
 setup.py                      |  2 +-
 webtest/forms.py              |  6 +++++-
 webtest/response.py           | 10 +++++++---
 10 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
old mode 100755
new mode 100644
index 673b71e..0addb29
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,17 @@
 News
 ====
 
+2.0.23 (2016-07-21)
+-------------------
+
+- Create universal wheels.
+
+
+2.0.22 (2016-07-21)
+-------------------
+
+-  Fix #160: Do not guess encoding if response's charset is set.
+
 2.0.21 (2016-04-12)
 -------------------
 
diff --git a/PKG-INFO b/PKG-INFO
index cc82867..513f7e2 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.21
+Version: 2.0.23
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud
@@ -16,7 +16,7 @@ Description: =======
         This provides convenient full-stack testing of applications written
         with any WSGI-compatible framework.
         
-        Full docs can be found at https://webtest.readthedocs.org/en/latest/
+        Full docs can be found at https://webtest.readthedocs.io/en/latest/
         
 Keywords: wsgi test unit tests web
 Platform: UNKNOWN
diff --git a/README.rst b/README.rst
index a7480e1..285c5f4 100644
--- a/README.rst
+++ b/README.rst
@@ -8,4 +8,4 @@ requests to that application, without starting up an HTTP server.
 This provides convenient full-stack testing of applications written
 with any WSGI-compatible framework.
 
-Full docs can be found at https://webtest.readthedocs.org/en/latest/
+Full docs can be found at https://webtest.readthedocs.io/en/latest/
diff --git a/WebTest.egg-info/PKG-INFO b/WebTest.egg-info/PKG-INFO
index cc82867..513f7e2 100644
--- a/WebTest.egg-info/PKG-INFO
+++ b/WebTest.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.21
+Version: 2.0.23
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud
@@ -16,7 +16,7 @@ Description: =======
         This provides convenient full-stack testing of applications written
         with any WSGI-compatible framework.
         
-        Full docs can be found at https://webtest.readthedocs.org/en/latest/
+        Full docs can be found at https://webtest.readthedocs.io/en/latest/
         
 Keywords: wsgi test unit tests web
 Platform: UNKNOWN
diff --git a/WebTest.egg-info/requires.txt b/WebTest.egg-info/requires.txt
index bf30d50..cce5500 100644
--- a/WebTest.egg-info/requires.txt
+++ b/WebTest.egg-info/requires.txt
@@ -13,7 +13,7 @@ mock
 PasteDeploy
 WSGIProxy2
 pyquery
-unittest2
+unittest2py3k
 
 [tests:python_version=="2.6"]
 unittest2
diff --git a/docs/conf.py b/docs/conf.py
index 3cc794e..d8c8816 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,8 +29,8 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode', 'sphinx.ext.intersphi
 
 intersphinx_mapping = {
     'python': ('http://docs.python.org/2.7', None),
-    'webob': ('https://webob.readthedocs.org/en/latest', None),
-    'waitrress': ('https://waitress.readthedocs.org/en/latest', None),
+    'webob': ('https://webob.readthedocs.io/en/latest', None),
+    'waitrress': ('https://waitress.readthedocs.io/en/latest', None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/setup.cfg b/setup.cfg
index 948593f..69720dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,9 @@
 [aliases]
 dev = develop easy_install webtest[tests]
 
+[bdist_wheel]
+universal = 1
+
 [nosetests]
 verbosity = 2
 detailed-errors = True
diff --git a/setup.py b/setup.py
index 8e3d367..ee81d2e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ import sys
 from setuptools import setup
 from setuptools import find_packages
 
-version = '2.0.21'
+version = '2.0.23'
 
 install_requires = [
     'six',
diff --git a/webtest/forms.py b/webtest/forms.py
index 9ff0a17..16f5637 100644
--- a/webtest/forms.py
+++ b/webtest/forms.py
@@ -400,7 +400,11 @@ class Form(object):
     def __init__(self, response, text, parser_features='html.parser'):
         self.response = response
         self.text = text
-        self.html = BeautifulSoup(self.text, parser_features)
+        if response and response.charset:
+            self.html = BeautifulSoup(self.text, parser_features,
+                                      from_encoding=response.charset)
+        else:
+            self.html = BeautifulSoup(self.text, parser_features)
 
         attrs = self.html('form')[0].attrs
         self.action = attrs.get('action', '')
diff --git a/webtest/response.py b/webtest/response.py
index 3952079..186ac47 100644
--- a/webtest/response.py
+++ b/webtest/response.py
@@ -359,7 +359,7 @@ class TestResponse(webob.Response):
             raise TypeError(
                 "The only keyword argument allowed is 'no'")
         for s in strings:
-            if not s in self:
+            if s not in self:
                 print_stderr("Actual response (no %r):" % s)
                 print_stderr(str(self))
                 raise IndexError(
@@ -426,7 +426,11 @@ class TestResponse(webob.Response):
             raise AttributeError(
                 "Not an HTML response body (content-type: %s)"
                 % self.content_type)
-        soup = BeautifulSoup(self.testbody, self.parser_features)
+        if self.charset:
+            soup = BeautifulSoup(self.testbody, self.parser_features,
+                                 from_encoding=self.charset)
+        else:
+            soup = BeautifulSoup(self.testbody, self.parser_features)
         return soup
 
     @property
@@ -484,7 +488,7 @@ class TestResponse(webob.Response):
             from lxml.html import fromstring
         except ImportError:  # pragma: no cover
             fromstring = etree.HTML
-        ## FIXME: would be nice to set xml:base, in some fashion
+        # FIXME: would be nice to set xml:base, in some fashion
         if self.content_type == 'text/html':
             return fromstring(self.testbody, base_url=self.request.url)
         else:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/webtest.git



More information about the Python-modules-commits mailing list