Merge lp:~noskcaj/ubuntu/vivid/webtest/merge into lp:ubuntu/vivid/webtest

[Jackson Doak]

Merge from debian

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

[Daniel Holbach (dholbach)]

Rejected by Brian Murray: Missing SRU information, seems to be a mistargetted sync

[lp:~noskcaj/ubuntu/vivid/webtest/merge]

24. By Jackson Doak on 2014-11-10

Fix target release

[Jackson Doak (noskcaj)]

Fixed

On Mon, Nov 10, 2014 at 7:33 PM, Daniel Holbach <email address hidden>
wrote:

> Rejected by Brian Murray: Missing SRU information, seems to be a
> mistargetted sync
> --
>
> https://code.launchpad.net/~noskcaj/ubuntu/vivid/webtest/merge/+merge/239652
> You are the owner of lp:~noskcaj/ubuntu/vivid/webtest/merge.
>

[Daniel Holbach (dholbach)]

Uploaded again.

Unmerged revisions

24. By Jackson Doak on 2014-11-10

Fix target release

23. By Jackson Doak on 2014-10-26

* Merge from Debian unstable. Remaining changes:
  - d/control: Demote python-lxml and python-pyquery to Suggests.
* New upstream release
* Standards-Version bumped to 3.9.6 (no changes needed)

=== modified file 'CHANGELOG.rst' (properties changed: -x to +x)
--- CHANGELOG.rst	2014-05-26 07:06:41 +0000
+++ CHANGELOG.rst	2014-11-10 08:54:22 +0000
@@ -1,6 +1,21 @@
 News
 ====
 
+2.0.16 (2014-09-19)
+-------------------
+
+- Fixed #110. Forced values for Radio inputs are no longer ignored by value
+  property on get.
+  [bayprogrammer]
+
+- Added method TestApp.set_parser_features to change the parser_features used
+  by BeautifulSoup.
+  [tomasmoreyra]
+
+- Added app.set_cookie
+  [luhn]
+
+
 2.0.15 (2014-04-17)
 -------------------
 

=== modified file 'PKG-INFO'
--- PKG-INFO	2014-05-26 07:06:41 +0000
+++ PKG-INFO	2014-11-10 08:54:22 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.15
+Version: 2.0.16
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud

=== modified file 'WebTest.egg-info/PKG-INFO'
--- WebTest.egg-info/PKG-INFO	2014-05-26 07:06:41 +0000
+++ WebTest.egg-info/PKG-INFO	2014-11-10 08:54:22 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: WebTest
-Version: 2.0.15
+Version: 2.0.16
 Summary: Helper to test WSGI applications
 Home-page: http://webtest.pythonpaste.org/
 Author: Gael Pasgrimaud

=== modified file 'WebTest.egg-info/requires.txt'
--- WebTest.egg-info/requires.txt	2014-05-26 07:06:41 +0000
+++ WebTest.egg-info/requires.txt	2014-11-10 08:54:22 +0000
@@ -9,4 +9,4 @@
 mock
 PasteDeploy
 WSGIProxy2
-pyquery
\ No newline at end of file
+pyquery

=== modified file 'debian/changelog'
--- debian/changelog	2014-05-26 07:06:41 +0000
+++ debian/changelog	2014-11-10 08:54:22 +0000
@@ -1,3 +1,17 @@
+webtest (2.0.16-1ubuntu1) vivid; urgency=medium
+
+  * Merge from Debian unstable.  Remaining changes:
+    - d/control: Demote python-lxml and python-pyquery to Suggests.
+
+ -- Jackson Doak <[e-mail]>  Sun, 26 Oct 2014 14:27:29 +1100
+
+webtest (2.0.16-1) unstable; urgency=medium
+
+  * New upstream release
+  * Standards-Version bumped to 3.9.6 (no changes needed)
+
+ -- Piotr Ożarowski <[e-mail]>  Thu, 25 Sep 2014 21:45:51 +0200
+
 webtest (2.0.15-1ubuntu1) utopic; urgency=medium
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2014-01-06 10:23:25 +0000
+++ debian/control	2014-11-10 08:54:22 +0000
@@ -12,7 +12,7 @@
  python-sphinx (>= 1.0.7+dfsg-1~), python-six, python-bs4, python-waitress,
 # tests
 # python-unittest2, python-pyquery
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 X-Python-Version: >=2.6
 Homepage: http://pythonpaste.org/webtest/
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/webtest/trunk/

=== modified file 'docs/changelog.rst' (properties changed: -x to +x)
--- docs/changelog.rst	2014-05-05 22:05:28 +0000
+++ docs/changelog.rst	2014-11-10 08:54:22 +0000
@@ -1,6 +1,21 @@
 News
 ====
 
+2.0.16 (2014-09-19)
+-------------------
+
+- Fixed #110. Forced values for Radio inputs are no longer ignored by value
+  property on get.
+  [bayprogrammer]
+
+- Added method TestApp.set_parser_features to change the parser_features used
+  by BeautifulSoup.
+  [tomasmoreyra]
+
+- Added app.set_cookie
+  [luhn]
+
+
 2.0.15 (2014-04-17)
 -------------------
 

=== modified file 'docs/contributing.rst' (properties changed: -x to +x)
=== modified file 'docs/testapp.rst'
--- docs/testapp.rst	2014-05-05 22:05:28 +0000
+++ docs/testapp.rst	2014-11-10 08:54:22 +0000
@@ -146,6 +146,7 @@
 
 To indicate another status is expected, use the keyword argument
 ``status=404`` to (for example) check that it is a 404 status, or
-``status="*"`` to allow any status.
+``status="*"`` to allow any status, or ``status="400 Custom Bad Request"``
+to use custom reason phrase.
 
 If you expect errors to be printed, use ``expect_errors=True``.

=== modified file 'setup.cfg'
--- setup.cfg	2014-05-05 22:05:28 +0000
+++ setup.cfg	2014-11-10 08:54:22 +0000
@@ -8,7 +8,7 @@
 doctest-extension = rst
 doctest-fixtures = _fixt
 include = docs
-exclude = (changelog|contributing).rst
+exclude = (CHANGELOG|contributing).rst
 cover-package = webtest
 with-coverage = 1
 doctest-options = +ELLIPSIS,+NORMALIZE_WHITESPACE

=== modified file 'setup.py'
--- setup.py	2014-05-26 07:06:41 +0000
+++ setup.py	2014-11-10 08:54:22 +0000
@@ -5,7 +5,7 @@
 from setuptools import setup
 from setuptools import find_packages
 
-version = '2.0.15'
+version = '2.0.16'
 
 install_requires = [
     'six',

=== modified file 'tests/test_app.py'
--- tests/test_app.py	2014-05-05 22:05:28 +0000
+++ tests/test_app.py	2014-11-10 08:54:22 +0000
@@ -109,6 +109,13 @@
         self.assertEqual(self.check_status('200 Ok', None), None)
         self.assertRaises(webtest.AppError, self.check_status, '400 Ok')
 
+    def test_check_status_with_custom_reason(self):
+        self.assertEqual(self.check_status('200 Ok', '200 Ok'), None)
+        self.assertRaises(webtest.AppError,
+                          self.check_status, '200 Ok', '200 Good Response')
+        self.assertRaises(webtest.AppError,
+                          self.check_status, '200 Ok', '400 Bad Request')
+
 
 class TestParserFeature(unittest.TestCase):
 
@@ -166,6 +173,27 @@
 
 class TestCookies(unittest.TestCase):
 
+    def test_set_cookie(self):
+        def cookie_app(environ, start_response):
+            req = Request(environ)
+            self.assertEqual(req.cookies['foo'], 'bar')
+            self.assertEqual(req.cookies['fizz'], ';bar=baz')
+
+            status = to_bytes("200 OK")
+            body = ''
+            headers = [
+                ('Content-Type', 'text/html'),
+                ('Content-Length', str(len(body))),
+            ]
+            start_response(status, headers)
+            return [to_bytes(body)]
+
+        app = webtest.TestApp(cookie_app)
+        app.set_cookie('foo', 'bar')
+        app.set_cookie('fizz', ';bar=baz')  # Make sure we're escaping.
+        app.get('/')
+        app.reset()
+
     def test_preserves_cookies(self):
         def cookie_app(environ, start_response):
             req = Request(environ)

=== modified file 'tests/test_forms.py'
--- tests/test_forms.py	2014-05-26 07:06:41 +0000
+++ tests/test_forms.py	2014-11-10 08:54:22 +0000
@@ -176,6 +176,16 @@
         self.assertEqual(form['foo'].value, 'bar')
         self.assertEqual(form.submit_fields(), [('foo', 'bar')])
 
+    def test_force_radio_input(self):
+        app = self.callFUT()
+        res = app.get('/form.html')
+
+        form = res.forms['radio_input_form']
+
+        form['foo'].force_value('fido')
+        self.assertEqual(form['foo'].value, 'fido')
+        self.assertEqual(form.submit_fields(), [('foo', 'fido')])
+
     def test_input_unicode(self):
         app = self.callFUT('form_unicode_inputs.html')
         res = app.get('/form.html')

=== modified file 'tox.ini'
--- tox.ini	2014-05-05 22:05:28 +0000
+++ tox.ini	2014-11-10 08:54:22 +0000
@@ -8,6 +8,8 @@
   {envbindir}/nosetests --with-xunit --xunit-file=nosetests-{envname}.xml []
   {envbindir}/coverage xml -o coverage-{envname}.xml webtest/*.py
 setenv =
+  LC_ALL=C
+  LANG=C
   SELENIUM_DRIVER=firefox
   COVERAGE_FILE=.coverage.{envname}
 

=== modified file 'webtest/app.py'
--- webtest/app.py	2014-05-26 07:06:41 +0000
+++ webtest/app.py	2014-11-10 08:54:22 +0000
@@ -28,6 +28,7 @@
 from webtest.compat import urlparse
 from webtest.compat import urlencode
 from webtest.compat import to_bytes
+from webtest.compat import escape_cookie_value
 from webtest.response import TestResponse
 from webtest import forms
 from webtest import lint
@@ -143,6 +144,7 @@
     def __init__(self, app, extra_environ=None, relative_to=None,
                  use_unicode=True, cookiejar=None, parser_features=None,
                  json_encoder=None, lint=True):
+
         if 'WEBTEST_TARGET_URL' in os.environ:
             app = os.environ['WEBTEST_TARGET_URL']
         if isinstance(app, string_types):
@@ -218,6 +220,32 @@
     def cookies(self):
         return dict([(cookie.name, cookie.value) for cookie in self.cookiejar])
 
+    def set_cookie(self, name, value):
+        """
+        Sets a cookie to be passed through with requests.
+
+        """
+        value = escape_cookie_value(value)
+        cookie = http_cookiejar.Cookie(
+            version=0,
+            name=name,
+            value=value,
+            port=None,
+            port_specified=False,
+            domain='.localhost',
+            domain_specified=True,
+            domain_initial_dot=False,
+            path='/',
+            path_specified=True,
+            secure=False,
+            expires=None,
+            discard=False,
+            comment=None,
+            comment_url=None,
+            rest=None
+        )
+        self.cookiejar.set_cookie(cookie)
+
     def reset(self):
         """
         Resets the state of the application; currently just clears
@@ -225,6 +253,13 @@
         """
         self.cookiejar.clear()
 
+    def set_parser_features(self, parser_features):
+        """
+        Changes the parser used by BeautifulSoup. See its documentation to
+        know the supported parsers.
+        """
+        self.RequestClass.ResponseClass.parser_features = parser_features
+
     def get(self, url, params=None, headers=None, extra_environ=None,
             status=None, expect_errors=False, xhr=False):
         """
@@ -530,7 +565,7 @@
                                expect_errors=expect_errors,
                                )
 
-    def do_request(self, req, status, expect_errors):
+    def do_request(self, req, status=None, expect_errors=None):
         """
         Executes the given webob Request (``req``), with the expected
         ``status``.  Generally :meth:`~webtest.TestApp.get` and
@@ -608,6 +643,9 @@
         if (isinstance(status, string_types) and '*' in status):
             if re.match(fnmatch.translate(status), res_status, re.I):
                 return
+        if isinstance(status, string_types):
+            if status == res_status:
+                return
         if isinstance(status, (list, tuple)):
             if res.status_int not in status:
                 raise AppError(

=== modified file 'webtest/compat.py'
--- webtest/compat.py	2013-10-02 19:37:14 +0000
+++ webtest/compat.py	2014-11-10 08:54:22 +0000
@@ -39,3 +39,81 @@
     from collections import OrderedDict
 except ImportError:  # pragma: no cover
     from ordereddict import OrderedDict  # noqa
+
+
+def escape_cookie_value(value):
+    """
+    Escapes a value so that it can be safely stored in a cookie.
+
+    """
+    return '"' + ''.join(
+        COOKIE_ESCAPE_CHAR_MAP.get(x, x) for x in value
+    ) + '"'
+
+
+# A list of illegal characters in a cookie and the escaped equivalent.
+# Taken from Python's cookie module.
+COOKIE_ESCAPE_CHAR_MAP = {
+    '\000' : '\\000',  '\001' : '\\001',  '\002' : '\\002',
+    '\003' : '\\003',  '\004' : '\\004',  '\005' : '\\005',
+    '\006' : '\\006',  '\007' : '\\007',  '\010' : '\\010',
+    '\011' : '\\011',  '\012' : '\\012',  '\013' : '\\013',
+    '\014' : '\\014',  '\015' : '\\015',  '\016' : '\\016',
+    '\017' : '\\017',  '\020' : '\\020',  '\021' : '\\021',
+    '\022' : '\\022',  '\023' : '\\023',  '\024' : '\\024',
+    '\025' : '\\025',  '\026' : '\\026',  '\027' : '\\027',
+    '\030' : '\\030',  '\031' : '\\031',  '\032' : '\\032',
+    '\033' : '\\033',  '\034' : '\\034',  '\035' : '\\035',
+    '\036' : '\\036',  '\037' : '\\037',
+
+    # Because of the way browsers really handle cookies (as opposed
+    # to what the RFC says) we also encode , and ;
+
+    ',' : '\\054', ';' : '\\073',
+
+    '"' : '\\"',       '\\' : '\\\\',
+
+    '\177' : '\\177',  '\200' : '\\200',  '\201' : '\\201',
+    '\202' : '\\202',  '\203' : '\\203',  '\204' : '\\204',
+    '\205' : '\\205',  '\206' : '\\206',  '\207' : '\\207',
+    '\210' : '\\210',  '\211' : '\\211',  '\212' : '\\212',
+    '\213' : '\\213',  '\214' : '\\214',  '\215' : '\\215',
+    '\216' : '\\216',  '\217' : '\\217',  '\220' : '\\220',
+    '\221' : '\\221',  '\222' : '\\222',  '\223' : '\\223',
+    '\224' : '\\224',  '\225' : '\\225',  '\226' : '\\226',
+    '\227' : '\\227',  '\230' : '\\230',  '\231' : '\\231',
+    '\232' : '\\232',  '\233' : '\\233',  '\234' : '\\234',
+    '\235' : '\\235',  '\236' : '\\236',  '\237' : '\\237',
+    '\240' : '\\240',  '\241' : '\\241',  '\242' : '\\242',
+    '\243' : '\\243',  '\244' : '\\244',  '\245' : '\\245',
+    '\246' : '\\246',  '\247' : '\\247',  '\250' : '\\250',
+    '\251' : '\\251',  '\252' : '\\252',  '\253' : '\\253',
+    '\254' : '\\254',  '\255' : '\\255',  '\256' : '\\256',
+    '\257' : '\\257',  '\260' : '\\260',  '\261' : '\\261',
+    '\262' : '\\262',  '\263' : '\\263',  '\264' : '\\264',
+    '\265' : '\\265',  '\266' : '\\266',  '\267' : '\\267',
+    '\270' : '\\270',  '\271' : '\\271',  '\272' : '\\272',
+    '\273' : '\\273',  '\274' : '\\274',  '\275' : '\\275',
+    '\276' : '\\276',  '\277' : '\\277',  '\300' : '\\300',
+    '\301' : '\\301',  '\302' : '\\302',  '\303' : '\\303',
+    '\304' : '\\304',  '\305' : '\\305',  '\306' : '\\306',
+    '\307' : '\\307',  '\310' : '\\310',  '\311' : '\\311',
+    '\312' : '\\312',  '\313' : '\\313',  '\314' : '\\314',
+    '\315' : '\\315',  '\316' : '\\316',  '\317' : '\\317',
+    '\320' : '\\320',  '\321' : '\\321',  '\322' : '\\322',
+    '\323' : '\\323',  '\324' : '\\324',  '\325' : '\\325',
+    '\326' : '\\326',  '\327' : '\\327',  '\330' : '\\330',
+    '\331' : '\\331',  '\332' : '\\332',  '\333' : '\\333',
+    '\334' : '\\334',  '\335' : '\\335',  '\336' : '\\336',
+    '\337' : '\\337',  '\340' : '\\340',  '\341' : '\\341',
+    '\342' : '\\342',  '\343' : '\\343',  '\344' : '\\344',
+    '\345' : '\\345',  '\346' : '\\346',  '\347' : '\\347',
+    '\350' : '\\350',  '\351' : '\\351',  '\352' : '\\352',
+    '\353' : '\\353',  '\354' : '\\354',  '\355' : '\\355',
+    '\356' : '\\356',  '\357' : '\\357',  '\360' : '\\360',
+    '\361' : '\\361',  '\362' : '\\362',  '\363' : '\\363',
+    '\364' : '\\364',  '\365' : '\\365',  '\366' : '\\366',
+    '\367' : '\\367',  '\370' : '\\370',  '\371' : '\\371',
+    '\372' : '\\372',  '\373' : '\\373',  '\374' : '\\374',
+    '\375' : '\\375',  '\376' : '\\376',  '\377' : '\\377'
+    }

=== modified file 'webtest/forms.py'
--- webtest/forms.py	2014-05-26 07:06:41 +0000
+++ webtest/forms.py	2014-11-10 08:54:22 +0000
@@ -237,7 +237,9 @@
     """Field representing ``<input type="radio">``"""
 
     def value__get(self):
-        if self.selectedIndex is not None:
+        if self._forced_value is not NoValue:
+            return self._forced_value
+        elif self.selectedIndex is not None:
             return self.options[self.selectedIndex][0]
         else:
             for option, checked, text in self.options:

=== modified file 'webtest/http.py'
--- webtest/http.py	2014-05-05 22:05:28 +0000
+++ webtest/http.py	2014-11-10 08:54:22 +0000
@@ -30,10 +30,10 @@
     """Perform a request until the server reply"""
     if retries < 0:
         return 0
-    conn = http_client.HTTPConnection(host, port, timeout=timeout)
     time.sleep(.3)
     for i in range(retries):
         try:
+            conn = http_client.HTTPConnection(host, int(port), timeout=timeout)
             conn.request('GET', path_info)
             res = conn.getresponse()
             return res.status