pyramid-fullauth 0.4.1__py3.3.egg → 0.5.0__py3.3.egg

EGG-INFO/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pyramid-fullauth
-Version: 0.4.1
+Version: 0.5.0
 Summary: This package intends to provide full authentication / authorisation
     implementation for pyramid applications
 Home-page: https://github.com/fizyk/pyramid_fullauth
@@ -14,6 +14,10 @@ Description: pyramid_fullauth
             :target: https://pypi.python.org/pypi/pyramid_fullauth/
             :alt: Latest PyPI version
         
+        .. image:: https://readthedocs.org/projects/pyramid_fullauth/badge/?version=v0.4.1
+            :target: https://readthedocs.org/projects/pyramid_fullauth/?badge=v0.4.1
+            :alt: Documentation Status
+        
         .. image:: https://pypip.in/d/pyramid_fullauth/badge.png
             :target: https://pypi.python.org/pypi/pyramid_fullauth/
             :alt: Number of PyPI downloads
@@ -35,17 +39,17 @@ Description: pyramid_fullauth
         Package status
         --------------
         
-        .. image:: https://travis-ci.org/fizyk/pyramid_fullauth.png?branch=master
+        .. image:: https://travis-ci.org/fizyk/pyramid_fullauth.png?branch=v0.4.1
             :target: https://travis-ci.org/fizyk/pyramid_fullauth
             :alt: Tests
         
-        .. image:: https://coveralls.io/repos/fizyk/pyramid_fullauth/badge.png?branch=master
-            :target: https://coveralls.io/r/fizyk/pyramid_fullauth?branch=master
+        .. image:: https://coveralls.io/repos/fizyk/pyramid_fullauth/badge.png?branch=v0.4.1
+            :target: https://coveralls.io/r/fizyk/pyramid_fullauth?branch=v0.4.1
             :alt: Coverage Status
         
-        .. image:: https://requires.io/github/fizyk/pyramid_fullauth/requirements.png?branch=master
-           :target: https://requires.io/github/fizyk/pyramid_fullauth/requirements/?branch=master
-           :alt: Requirements Status
+        .. image:: https://requires.io/github/fizyk/pyramid_fullauth/requirements.svg?tag=v0.4.1
+             :target: https://requires.io/github/fizyk/pyramid_fullauth/requirements/?tag=v0.4.1
+             :alt: Requirements Status
         
         Package resources
         -----------------
@@ -73,6 +77,14 @@ Description: pyramid_fullauth
         CHANGELOG
         =========
         
+        0.5.0
+        -------
+        
+        - full python3 compatibility, since velruse migrated to py3 enabled requests-oauth
+        -require velruse 1.1.1
+        - run tests with sqlalchemy 1.0.x
+        - small updates to conform with new linters versions embedded in pylama
+        
         0.4.1
         -------
         
@@ -83,7 +95,7 @@ Description: pyramid_fullauth
         -------
         
         - python 3 compatibility (without oauth2 though)
-        - cleared use of deprecated :func:`pyramid.security.authenticated_userid` in favour of :attr:`pyramid.request.Request.authenticated_userid`
+        - cleared use of deprecated function `pyramid.security.authenticated_userid` in favour of `pyramid.request.Request.authenticated_userid` attribute.
         - make email fields case insensitive by using hybrid properties and CaseInsensitive comparator for model.
         
         0.3.3

EGG-INFO/SOURCES.txt

@@ -25,6 +25,7 @@ docs/source/api/request.rst
 docs/source/api/tools.rst
 pyramid_fullauth/__init__.py
 pyramid_fullauth/auth.py
+pyramid_fullauth/compat.py
 pyramid_fullauth/events.py
 pyramid_fullauth/exceptions.py
 pyramid_fullauth/request.py

EGG-INFO/requires.txt

@@ -3,6 +3,7 @@ pyramid >=1.4
 pyramid_mako
 tzf.pyramid_yml >=1.0
 pyramid_basemodel>=0.3
+velruse >=1.1.1
 
 [docs]
 sphinx
@@ -11,3 +12,4 @@ sphinx
 mock
 pytest_pyramid
 pytest-cov
+pytest-dbfixtures[mysql,postgresql]

pyramid_fullauth/__init__.py

@@ -3,7 +3,6 @@
 # This module is part of pyramid_fullauth and is released under
 # the MIT License (MIT): http://opensource.org/licenses/MIT
 """Fullauth's configuration module."""
-import sys
 import logging
 
 from tzf.pyramid_yml import config_defaults
@@ -17,7 +16,7 @@ from pyramid_fullauth.auth import groupfinder
 from pyramid_fullauth.routing import predicates
 from pyramid_fullauth.request import login_perform, logout, user
 
-__version__ = '0.4.1'
+__version__ = '0.5.0'
 
 
 logger = logging.getLogger(__name__)
@@ -82,9 +81,9 @@ def includeme(configurator):
     # scan base views
     configurator.scan('pyramid_fullauth.views.basic')
 
-    # check for the social. (And python 2)
+    # check for the social.
     # If social is not available, we will not turn it on!
-    if 'social' in fullauth_config and sys.version_info.major == 2:
+    if 'social' in fullauth_config:
         # Velruse init (for social auth)
 
         # scan social views

pyramid_fullauth/compat.py

@@ -0,0 +1,18 @@
+
+# Copyright (c) 2013 - 2015 by pyramid_fullauth authors and contributors <see AUTHORS file>
+#
+# This module is part of pyramid_fullauth and is released under
+# the MIT License (MIT): http://opensource.org/licenses/MIT
+"""pyramid_fullauth's compatibility file for python2 and 3."""
+
+import sys
+
+
+if sys.version_info.major == 2:
+    from urllib import urlencode
+    from urlparse import urlparse, parse_qs
+else:
+    from urllib.parse import urlencode, urlparse, parse_qs
+
+
+__all__ = ('urlencode', 'urlparse', 'parse_qs')

pyramid_fullauth/events.py

@@ -236,7 +236,6 @@ class SocialAccountAlreadyConnected(_BaseSocialRegister):
     """
     Event raised when social account is already connected to some other user.
 
-
     Allow to add custom logic, when someone tries to connect social account to
     second user in application.
 

pyramid_fullauth/resources/helpers/social.mako

@@ -1,6 +1,6 @@
 ## -*- coding: utf-8 -*-
 <%doc>
-Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
+Copyright (c) 2013 - 2015 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
 This module is part of pyramid_fullauth and is released under
 the MIT License (MIT): http://opensource.org/licenses/MIT
@@ -9,9 +9,9 @@ the MIT License (MIT): http://opensource.org/licenses/MIT
 <%def name="social_auth_uri(name, **kw)">
 <%
     from velruse import login_url
-    import urllib
+    from pyramid_fullauth.compat import urlencode
 %>
 % if name in request.registry['config'].fullauth.social:
-${login_url(request, name) + ('?{0}'.format(urllib.urlencode(kw)) if kw else '')}
+${login_url(request, name) + ('?{0}'.format(urlencode(kw)) if kw else '')}
 % endif
 </%def>

pyramid_fullauth/resources/templates/login.mako

@@ -1,5 +1,4 @@
 ## -*- coding: utf-8 -*-
-<% import sys %>
 <%doc>
 Copyright (c) 2013 - 2014 by pyramid_fullauth authors and contributors <see AUTHORS file>
 
@@ -12,6 +11,4 @@ the MIT License (MIT): http://opensource.org/licenses/MIT
     <div class="alert alert-error">${_('Error!', domain='pyramid_fullauth')} ${msg}</div>
 % endif
 <%include file="_form.login.mako"/>
-% if sys.version_info.major == 2:
-    <%include file="_social.login.mako"/>
-% endif
+<%include file="_social.login.mako"/>

tests/conftest.py

@@ -1,6 +1,4 @@
 """Most of the fixtures needed."""
-import sys
-
 from mock import Mock
 import pytest
 
@@ -14,10 +12,6 @@ from pyramid.compat import text_type
 from pytest_pyramid import factories
 import pyramid_basemodel
 
-py2only = pytest.mark.skipif(
-    sys.version_info.major > 2,
-    reason='oauth2-python and velruse does not support python3')
-
 
 @pytest.fixture
 def web_request():
@@ -40,13 +34,8 @@ def web_request():
 
     return request
 
-if sys.version_info.major == 2:
-    databases = ['sqlite', 'mysql', 'postgresql']
-else:
-    databases = ['sqlite']
-
 
-@pytest.fixture(scope='function', params=databases)
+@pytest.fixture(scope='function', params=['sqlite', 'mysql', 'postgresql'])
 def db_session(request):
     """SQLAlchemy session."""
     from pyramid_fullauth.models import Base

tests/unit/test_social_view.py

@@ -4,10 +4,8 @@ import mock
 from pyramid.compat import text_type
 
 from pyramid_fullauth.views.social import SocialLoginViews
-from tests.conftest import py2only
 
 
-@py2only
 @pytest.mark.parametrize('profile, email', [
     (
         {

tests/unit/test_user_password.py

@@ -45,7 +45,7 @@ def test_password_empty(db_session, user):
 
 
 def test_set_reset(db_session, user):
-    """User.set_reset - generates reset key for those who forgot their password. """
+    """User.set_reset - generates reset key for those who forgot their password."""
     user = db_session.merge(user)
     assert not user.reset_key
     user.set_reset()

tests/views/test_events.py

@@ -8,12 +8,7 @@ from pyramid.view import view_config
 from pyramid.httpexceptions import HTTPFound
 from sqlalchemy.orm.exc import NoResultFound
 from pytest_pyramid import factories
-
-try:
-    from velruse import AuthenticationComplete
-except ImportError:
-    # py3 version doesn't have social auth
-    pass
+from velruse import AuthenticationComplete
 
 
 from pyramid_fullauth.models import User
@@ -27,7 +22,6 @@ from pyramid_fullauth.events import (
     BeforeRegister, AfterRegister
 )
 from tests.tools import authenticate, is_user_logged, DEFAULT_USER
-from tests.conftest import py2only
 from tests.views.conftest import mock_translate
 
 EVENT_PATH = '/event?event={0.__name__}'
@@ -347,7 +341,6 @@ def aftersocialregister_config(evented_config):
 aftersocialregister_app = factories.pyramid_app('aftersocialregister_config')
 
 
-@py2only
 def test_aftersocialregister(aftersocialregister_config, aftersocialregister_app, db_session):
     """Register fresh user and logs him in and check response if redirect from AfterSocialRegister."""
     profile = {
@@ -389,7 +382,6 @@ def aftersociallogin_config(evented_config):
 aftersociallogin_app = factories.pyramid_app('aftersociallogin_config')
 
 
-@py2only
 def test_aftersociallogin(aftersociallogin_config, aftersociallogin_app, db_session):
     """Register fresh user and logs him in and check response if redirect from AfterSocialLogIn."""
     profile = {
@@ -432,7 +424,6 @@ def alreadyconnected_config(evented_config):
 alreadyconnected_app = factories.pyramid_app('alreadyconnected_config')
 
 
-@py2only
 def test_alreadyconnected(alreadyconnected_config, alreadyconnected_app, facebook_user, db_session):
     """Try to connect facebook account to logged in user used by other user check redirect from SocialAccountAlreadyConnected."""
     # this user will be logged and trying to connect facebook's user account.

tests/views/test_login_social.py

@@ -4,35 +4,34 @@ from pyramid import testing
 from pyramid.compat import text_type
 from mock import MagicMock
 
-try:
-    from velruse import AuthenticationComplete
-    from pyramid_fullauth.views.social import SocialLoginViews
-except ImportError:
-    # tests will be skipped anyway
-    pass
+from velruse import AuthenticationComplete
+from pyramid_fullauth.views.social import SocialLoginViews
 
 from pyramid_fullauth.models import User
+from pyramid_fullauth.compat import urlparse, parse_qs
 
-from tests.conftest import py2only
 from tests.views.conftest import mock_translate
 
 
-@py2only
 def test_social_login_link(social_app):
     """Login:Form displayed social form."""
     res = social_app.get('/login')
     assert ('Connect with facebook</a>' in res.body.decode('unicode_escape'))
 
 
-@py2only
 def test_social_click_link(social_app):
     """Click social login link."""
     res = social_app.get('/login/facebook?scope=email%2Coffline_access', status=302)
-    assert (res.headers['Location'].startswith(
-        'https://www.facebook.com/dialog/oauth/?scope=email%2Coffline_access&state='))
+    redirect = urlparse(res.headers['Location'])
+    query = parse_qs(redirect.query)
+    assert redirect.netloc == 'www.facebook.com', "We should redirect user to facebook"
+    assert redirect.path == '/dialog/oauth/', "Path should be oauth"
+    assert 'redirect_uri' in query
+    assert 'scope' in query
+    assert query['redirect_uri'] == ['http://localhost/login/facebook/callback']
+    assert query['scope'] == ['email,offline_access']
 
 
-@py2only
 def test_social_login_register(social_config, db_session):
     """Register fresh user and logs him in."""
     profile = {
@@ -65,7 +64,6 @@ def test_social_login_register(social_config, db_session):
     assert user.provider_id('facebook') == profile['accounts'][0]['userid']
 
 
-@py2only
 def test_login_different_social_account(social_config, db_session, facebook_user):
     """
     Login with different social account than connected from same provider.
@@ -101,7 +99,6 @@ def test_login_different_social_account(social_config, db_session, facebook_user
     assert facebook_user.provider_id('facebook') is not profile['accounts'][0]['userid']
 
 
-@py2only
 def test_login_social_connect(social_config, active_user, db_session):
     """Connect and logs user in."""
     user = db_session.merge(active_user)
@@ -130,7 +127,6 @@ def test_login_social_connect(social_config, active_user, db_session):
     assert out == {'status': True}
 
 
-@py2only
 def test_logged_social_connect_account(social_config, active_user, db_session):
     """Connect facebook account to logged in user."""
     user = db_session.merge(active_user)
@@ -163,7 +159,6 @@ def test_logged_social_connect_account(social_config, active_user, db_session):
     assert user.provider_id('facebook') == profile['accounts'][0]['userid']
 
 
-@py2only
 def test_logged_social_connect_self(social_config, facebook_user, db_session):
     """Connect self."""
     user = db_session.merge(facebook_user)
@@ -200,7 +195,6 @@ def test_logged_social_connect_self(social_config, facebook_user, db_session):
     assert user.provider_id('facebook') == profile['accounts'][0]['userid']
 
 
-@py2only
 def test_logged_social_connect_second_account(social_config, facebook_user, db_session):
     """Connect second facebook account to logged in user."""
     user = db_session.merge(facebook_user)
@@ -239,7 +233,6 @@ def test_logged_social_connect_second_account(social_config, facebook_user, db_s
     assert user.provider_id('facebook') is not profile['accounts'][0]['userid']
 
 
-@py2only
 def test_logged_social_connect_used_account(social_config, facebook_user, db_session):
     """Try to connect facebook account to logged in user used by other user."""
     # this user will be logged and trying to connect facebook's user account.