~roadmr/canonical-identity-provider/fix-deprecation-warnings-1

« back to all changes in this revision

Viewing changes to src/identityprovider/gargoyle_conditions.py

Committer: Tom Wardill
Date: 2018-02-14 14:05:59 UTC
mfrom: (1602 work)
mto: (1597.1.44 django-1.10)
mto: This revision was merged to the branch mainline in revision 1603.
Revision ID: tom.wardill@canonical.com-20180214140559-ow5txzwy46nopws2

Merge flake8 changes

files added:
scripts/flake8_import_order_sso

scripts/flake8_import_order_sso/flake8_import_order_sso.py

scripts/flake8_import_order_sso/setup.py

setup.cfg

files modified:
Makefile

django_project/paths.py

django_project/wsgi.py

requirements_devel.txt

scripts/settings-to-conncheck.py

src/api/urls.py

src/api/v10/decorators.py

src/api/v10/handlers.py

src/api/v10/tests/test_handlers.py

src/api/v10/tests/utils.py

src/api/v11/handlers.py

src/api/v11/tests/test_handlers.py

src/api/v20/handlers.py

src/api/v20/registration.py

src/api/v20/tests/test_auth.py

src/api/v20/tests/test_decorators.py

src/api/v20/tests/test_handlers.py

src/api/v20/tests/test_login.py

src/api/v20/tests/test_registration.py

src/api/v20/urls.py

src/api/v20/utils.py

src/identityprovider/admin.py

src/identityprovider/apiutils.py

src/identityprovider/auth.py

src/identityprovider/context_processors.py

src/identityprovider/crypto.py

src/identityprovider/emailutils.py

src/identityprovider/fields.py

src/identityprovider/gargoyle_conditions.py

src/identityprovider/management/commands/create_test_team.py

src/identityprovider/management/commands/delete_suspended_accounts.py

src/identityprovider/management/commands/get_account_openid.py

src/identityprovider/management/commands/linkstatic.py

src/identityprovider/management/commands/runserver_plus.py

src/identityprovider/management/commands/suspend_unverified_accounts.py

src/identityprovider/management/commands/switches.py

src/identityprovider/management/commands/upload_fobs.py

src/identityprovider/middleware/oopsplease.py

src/identityprovider/middleware/profile.py

src/identityprovider/middleware/xrds.py

src/identityprovider/models/account.py

src/identityprovider/models/captcha.py

src/identityprovider/models/emailaddress.py

src/identityprovider/models/openidmodels.py

src/identityprovider/models/person.py

src/identityprovider/models/twofactor.py

src/identityprovider/nexus_modules.py

src/identityprovider/preflight_checks.py

src/identityprovider/signals.py

src/identityprovider/storage.py

src/identityprovider/store.py

src/identityprovider/teams.py

src/identityprovider/tests/factory.py

src/identityprovider/tests/sso_server/test_standalone_login.py

src/identityprovider/tests/test_admin.py

src/identityprovider/tests/test_apiutils.py

src/identityprovider/tests/test_apps.py

src/identityprovider/tests/test_auth.py

src/identityprovider/tests/test_backend_nop_base.py

src/identityprovider/tests/test_check_unverified_accounts_consistency.py

src/identityprovider/tests/test_command_add_bot_account.py

src/identityprovider/tests/test_command_add_canonical_email.py

src/identityprovider/tests/test_command_add_openid_rp_config.py

src/identityprovider/tests/test_command_add_to_team.py

src/identityprovider/tests/test_command_clean_old_authtokens.py

src/identityprovider/tests/test_command_cleanup.py

src/identityprovider/tests/test_command_get_account_openid.py

src/identityprovider/tests/test_command_import_leak_data.py

src/identityprovider/tests/test_command_readonly.py

src/identityprovider/tests/test_command_suspend_and_delete_unverified_accounts.py

src/identityprovider/tests/test_fields.py

src/identityprovider/tests/test_forms.py

src/identityprovider/tests/test_middleware.py

src/identityprovider/tests/test_models_account.py

src/identityprovider/tests/test_models_api.py

src/identityprovider/tests/test_models_authtoken.py

src/identityprovider/tests/test_models_device.py

src/identityprovider/tests/test_models_openidmodels.py

src/identityprovider/tests/test_models_person.py

src/identityprovider/tests/test_oops.py

src/identityprovider/tests/test_readonly.py

src/identityprovider/tests/test_routers.py

src/identityprovider/tests/test_signed.py

src/identityprovider/tests/test_teams.py

src/identityprovider/tests/test_utils.py

src/identityprovider/tests/test_validators.py

src/identityprovider/tests/test_views_server.py

src/identityprovider/tests/test_views_testing.py

src/identityprovider/tests/test_views_utils.py

src/identityprovider/tests/test_widgets.py

src/identityprovider/tests/test_wsgi.py

src/identityprovider/tests/test_xrds.py

src/identityprovider/tests/utils.py

src/identityprovider/urls.py

src/identityprovider/validators.py

src/identityprovider/views/readonly.py

src/identityprovider/views/server.py

src/identityprovider/views/testing.py

src/identityprovider/widgets.py

src/identityprovider/wsgi.py

src/mockservice/sso_mockserver/mockserver.py

src/testing/runner.py

src/tests/test_make_targets.py

src/ubuntu_sso_saml/processors.py

src/ubuntu_sso_saml/tests/test_processors.py

src/ubuntu_sso_saml/tests/test_utils.py

src/ubuntu_sso_saml/views.py

src/webservices/launchpad.py

src/webui/decorators.py

src/webui/tests/test_views_account.py

src/webui/tests/test_views_auth_log.py

src/webui/tests/test_views_consumer.py

src/webui/tests/test_views_devices.py

src/webui/tests/test_views_i18n.py

src/webui/tests/test_views_registration.py

src/webui/tests/test_views_ui.py

src/webui/views/account.py

src/webui/views/consumer.py

src/webui/views/devices.py

src/webui/views/errors.py

src/webui/views/i18n.py

src/webui/views/registration.py

src/webui/views/ui.py

Show diffs side-by-side

added added

removed removed

src/identityprovider/gargoyle_conditions.py

from __future__ import absolute_import

import re

from django.contrib.gis.geoip import GeoIP

import re

from gargoyle import gargoyle

from gargoyle.builtins import ModelConditionSet, RequestConditionSet

from gargoyle.conditions import String, Field

from gargoyle.conditions import Field, String

from identityprovider.models.account import Account

from identityprovider.models.const import EmailStatus

Older »