From: Richard Hoekstra <richard.-hoekstra@hotmail.com>
Date: Sat, 13 Jun 2020 16:08:08 +0000 (-0700)
Subject: ✨ Export OAuth2PasswordRequestFormStrict from security (#1462)
X-Git-Tag: 0.57.0~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd2acbcabbb5577013c2207778e76595fb3aa0e9;p=thirdparty%2Ffastapi%2Ffastapi.git

✨ Export OAuth2PasswordRequestFormStrict from security (#1462)

* Update __init__.py

Fixes an import error:

from fastapi.security import OAuth2PasswordBearer, OAuth2PasswordRequestFormStrict
ImportError: cannot import name 'OAuth2PasswordRequestFormStrict'

* Simplify import of OAuth2PasswordRequestFormStrict

* Simplify import of OAuth2PasswordRequestFormStrict
---

diff --git a/fastapi/security/__init__.py b/fastapi/security/__init__.py
index 37bf213c16..ad727742c3 100644
--- a/fastapi/security/__init__.py
+++ b/fastapi/security/__init__.py
@@ -11,6 +11,7 @@ from .oauth2 import (
     OAuth2AuthorizationCodeBearer,
     OAuth2PasswordBearer,
     OAuth2PasswordRequestForm,
+    OAuth2PasswordRequestFormStrict,
     SecurityScopes,
 )
 from .open_id_connect_url import OpenIdConnect
diff --git a/tests/test_security_oauth2.py b/tests/test_security_oauth2.py
index 266dab6e5a..6c513039f2 100644
--- a/tests/test_security_oauth2.py
+++ b/tests/test_security_oauth2.py
@@ -1,7 +1,6 @@
 import pytest
 from fastapi import Depends, FastAPI, Security
-from fastapi.security import OAuth2
-from fastapi.security.oauth2 import OAuth2PasswordRequestFormStrict
+from fastapi.security import OAuth2, OAuth2PasswordRequestFormStrict
 from fastapi.testclient import TestClient
 from pydantic import BaseModel
 
diff --git a/tests/test_security_oauth2_optional.py b/tests/test_security_oauth2_optional.py
index 06967bd766..c2c9764b05 100644
--- a/tests/test_security_oauth2_optional.py
+++ b/tests/test_security_oauth2_optional.py
@@ -2,8 +2,7 @@ from typing import Optional
 
 import pytest
 from fastapi import Depends, FastAPI, Security
-from fastapi.security import OAuth2
-from fastapi.security.oauth2 import OAuth2PasswordRequestFormStrict
+from fastapi.security import OAuth2, OAuth2PasswordRequestFormStrict
 from fastapi.testclient import TestClient
 from pydantic import BaseModel