From: Ben Darnell <ben@bendarnell.com>
Date: Tue, 16 Sep 2014 02:26:48 +0000 (-0400)
Subject: Merge remote-tracking branch 'leekchan/set_cookie_expires_days'
X-Git-Tag: v4.1.0b1~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaec44c68b475890ee12c8bad01d9a7236ed1138;p=thirdparty%2Ftornado.git

Merge remote-tracking branch 'leekchan/set_cookie_expires_days'

Conflicts:
	tornado/test/web_test.py
---

aaec44c68b475890ee12c8bad01d9a7236ed1138
diff --cc tornado/test/web_test.py
index 149b47955,0110590f1..b984ac4a7
--- a/tornado/test/web_test.py
+++ b/tornado/test/web_test.py
@@@ -10,8 -10,8 +10,8 @@@ from tornado.simple_httpclient import S
  from tornado.template import DictLoader
  from tornado.testing import AsyncHTTPTestCase, ExpectLog, gen_test
  from tornado.test.util import unittest
- from tornado.util import u, ObjectDict, unicode_type
+ from tornado.util import u, ObjectDict, unicode_type, timedelta_to_seconds
 -from tornado.web import RequestHandler, authenticated, Application, asynchronous, url, HTTPError, StaticFileHandler, _create_signature_v1, create_signed_value, decode_signed_value, ErrorHandler, UIModule, MissingArgumentError, stream_request_body, Finish
 +from tornado.web import RequestHandler, authenticated, Application, asynchronous, url, HTTPError, StaticFileHandler, _create_signature_v1, create_signed_value, decode_signed_value, ErrorHandler, UIModule, MissingArgumentError, stream_request_body, Finish, removeslash, addslash
  
  import binascii
  import contextlib