Replace 'basestring' checks with Py3k compat checks.
| | |
| | | STRING_TYPES = (str,) |
| | | |
| | | from repoze.who._compat import get_cookies |
| | | from repoze.who._compat import STRING_TYPES |
| | | |
| | | |
| | | class AuthTicket(object): |
| | |
| | | return self.app(environ, cookie_setting_start_response) |
| | | |
| | | def set_user_cookie(self, environ, userid, tokens, user_data): |
| | | if not isinstance(tokens, basestring): |
| | | if not isinstance(tokens, STRING_TYPES): |
| | | tokens = ','.join(tokens) |
| | | if self.include_ip: |
| | | remote_addr = environ['REMOTE_ADDR'] |
| | |
| | | from http.cookies import SimpleCookie |
| | | from http.cookies import CookieError |
| | | |
| | | try: |
| | | STRING_TYPES = (str, unicode) |
| | | except NameError: |
| | | STRING_TYPES = (str,) |
| | | |
| | | def REQUEST_METHOD(environ): |
| | | return environ['REQUEST_METHOD'] |
| | | |
| | |
| | | from repoze.who.interfaces import IAuthenticator |
| | | from repoze.who._compat import get_cookies |
| | | import repoze.who._auth_tkt as auth_tkt |
| | | from repoze.who._compat import STRING_TYPES |
| | | |
| | | _NOW_TESTING = None # unit tests can replace |
| | | def _now(): #pragma NO COVERAGE |
| | |
| | | return datetime.datetime.now() |
| | | |
| | | class AuthTktCookiePlugin(object): |
| | | |
| | | implements(IIdentifier, IAuthenticator) |
| | | |
| | | |
| | | userid_type_decoders = {'int':int} |
| | | try: |
| | |
| | | id(self)) #pragma NO COVERAGE |
| | | |
| | | def _bool(value): |
| | | if isinstance(value, basestring): |
| | | if isinstance(value, STRING_TYPES): |
| | | return value.lower() in ('yes', 'true', '1') |
| | | return value |
| | | |
| | |
| | | # Authorization middleware |
| | | from pkg_resources import EntryPoint |
| | | |
| | | from repoze.who._compat import STRING_TYPES |
| | | |
| | | def authenticated_predicate(): |
| | | def _predicate(environ): |
| | | return 'REMOTE_USER' in environ or 'repoze.who.identity' in environ |
| | |
| | | |
| | | def make_predicate_restriction(app, global_config, |
| | | predicate, enabled=True, **kw): |
| | | if isinstance(predicate, basestring): |
| | | if isinstance(predicate, STRING_TYPES): |
| | | predicate = EntryPoint.parse('x=%s' % predicate).load(False) |
| | | return PredicateRestriction(app, predicate, enabled, **kw) |