Skip to content

apply updated isort processing #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk/caches/local.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import attr
import six

from . import CryptoMaterialsCacheEntry
from ..exceptions import CacheKeyError, NotSupportedError
from . import CryptoMaterialsCacheEntry
from .base import CryptoMaterialsCache

_OPPORTUNISTIC_EVICTION_ROUNDS = 10
Expand Down
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk/caches/null.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
"""Null cache: a cache which does not cache."""
from . import CryptoMaterialsCacheEntry
from ..exceptions import CacheKeyError
from . import CryptoMaterialsCacheEntry
from .base import CryptoMaterialsCache


Expand Down
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk/materials_managers/caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import attr
import six

from . import EncryptionMaterialsRequest
from ..caches import (
CryptoMaterialsCacheEntryHints,
build_decryption_materials_cache_key,
Expand All @@ -28,6 +27,7 @@
from ..internal.defaults import MAX_BYTES_PER_KEY, MAX_MESSAGES_PER_KEY
from ..internal.str_ops import to_bytes
from ..key_providers.base import MasterKeyProvider
from . import EncryptionMaterialsRequest
from .base import CryptoMaterialsManager
from .default import DefaultCryptoMaterialsManager

Expand Down
2 changes: 1 addition & 1 deletion src/aws_encryption_sdk/materials_managers/default.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@

import attr

from . import DecryptionMaterials, EncryptionMaterials
from ..exceptions import MasterKeyProviderError, SerializationError
from ..internal.crypto.authentication import Signer, Verifier
from ..internal.crypto.elliptic_curve import generate_ecc_signing_key
from ..internal.defaults import ALGORITHM, ENCODED_SIGNER_KEY
from ..internal.str_ops import to_str
from ..internal.utils import prepare_data_keys
from ..key_providers.base import MasterKeyProvider
from . import DecryptionMaterials, EncryptionMaterials
from .base import CryptoMaterialsManager

_LOGGER = logging.getLogger(__name__)
Expand Down