From 996361c233d7d20ac0dcfc34b981c7aa158a5ea2 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Oct 2015 15:34:38 +0200
Subject: [PATCH 1/2] Docs

---
 aiohttp_security/api.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/aiohttp_security/api.py b/aiohttp_security/api.py
index 26cfdad..deff906 100644
--- a/aiohttp_security/api.py
+++ b/aiohttp_security/api.py
@@ -11,8 +11,10 @@ AUTZ_KEY = 'aiohttp_security_autz_policy'
 def remember(request, response, identity, **kwargs):
     """Remember identity into response.
 
-    The action is performed by indentity_policy.remember()
-    Usually the idenity is stored in user cookies homehow.
+    The action is performed by identity_policy.remember()
+
+    Usually the idenity is stored in user cookies homehow but may be
+    pushed into custom header also.
     """
     assert isinstance(identity, str), identity
     identity_policy = request.app.get(IDENTITY_KEY)
@@ -28,6 +30,11 @@ def remember(request, response, identity, **kwargs):
 
 @asyncio.coroutine
 def forget(request, response):
+    """Drop current identity.
+
+    Usually it clears cookie or server-side storage to forget user
+    session.
+    """
     identity_policy = request.app.get(IDENTITY_KEY)
     if identity_policy is None:
         text = ("Security subsystem is not initialized, "

From 6f2ff8ff79dc41588ed0a9de738bcc6b5917d191 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Oct 2015 16:05:30 +0200
Subject: [PATCH 2/2] Try to fix travis

---
 .travis.yml | 11 ++++-------
 setup.py    | 22 ++++++----------------
 2 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b75ea72..84321a6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,15 +1,12 @@
 language: python
 python:
-  - 3.3
   - 3.4
+  - 3.5
 
 install:
-- pip install --upgrade setuptools
-- pip install pyflakes
-- pip install pep8
-- pip install coveralls --use-mirrors
-- pip install aiohttp
-- python setup.py develop
+- pip install --upgrade pip
+- pip install -r requirements-dev.txt
+- pip install coveralls
 
 script:
 - pyflakes aiohttp_security tests
diff --git a/setup.py b/setup.py
index 86762f5..ccbf9da 100644
--- a/setup.py
+++ b/setup.py
@@ -2,28 +2,18 @@ import codecs
 from setuptools import setup, find_packages
 import os
 import re
+import subprocess
 import sys
 
 from setuptools.command.test import test as TestCommand
 
 
 class PyTest(TestCommand):
-    user_options = [('pytest-args=', 'a', "Arguments to pass to py.test")]
+    user_options = []
 
-    def initialize_options(self):
-        TestCommand.initialize_options(self)
-        self.pytest_args = []
-
-    def finalize_options(self):
-        TestCommand.finalize_options(self)
-        self.test_args = []
-        self.test_suite = True
-
-    def run_tests(self):
-        # import here, cause outside the eggs aren't loaded
-        import pytest
-        errno = pytest.main(self.pytest_args)
-        sys.exit(errno)
+    def run(self):
+        errno = subprocess.call([sys.executable, '-m', 'pytest', 'tests'])
+        raise SystemExit(errno)
 
 
 with codecs.open(os.path.join(os.path.abspath(os.path.dirname(
@@ -37,7 +27,7 @@ with codecs.open(os.path.join(os.path.abspath(os.path.dirname(
 def read(f):
     return open(os.path.join(os.path.dirname(__file__), f)).read().strip()
 
-install_requires = ['aiohttp>=0.14']
+install_requires = ['aiohttp>=0.18']
 tests_require = install_requires + ['pytest']
 extras_require = {}