diff --git a/setup.py b/setup.py index 0fcf09623564371356b989135b0233a2f017f0ae..2068a649e3ed8c97f8df1afbab731d8f448b6623 100644 --- a/setup.py +++ b/setup.py @@ -12,6 +12,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import functools import glob import os diff --git a/src/nacl/__init__.py b/src/nacl/__init__.py index a6f7b59e8f84ee8177d09031ecba8d58ddf8cd3a..0b0bb41592f7385d2a6b7dd42f31da058d815dbc 100644 --- a/src/nacl/__init__.py +++ b/src/nacl/__init__.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function __all__ = [ "__title__", "__summary__", "__uri__", "__version__", "__author__", diff --git a/src/nacl/_cffi_fix.py b/src/nacl/_cffi_fix.py index c6ecc486f41c2970e967d494654cc069c111923d..62772202f6195abd82c67040e0c2fc390c902ab9 100644 --- a/src/nacl/_cffi_fix.py +++ b/src/nacl/_cffi_fix.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import imp import os.path import sys diff --git a/src/nacl/c/__init__.py b/src/nacl/c/__init__.py index 0a73a5ba09a14b3676803a30e548a7238e106a57..7499bbd6447ff0c253bf967dbf6cbd6ca7a6a559 100644 --- a/src/nacl/c/__init__.py +++ b/src/nacl/c/__init__.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl.c.crypto_box import ( diff --git a/src/nacl/c/crypto_box.py b/src/nacl/c/crypto_box.py index c63fd0e10360dc8d1818df7ce1982d5314366a9a..d9fd4ec7fa876a6f1d2d11bd73f0d727338efc66 100644 --- a/src/nacl/c/crypto_box.py +++ b/src/nacl/c/crypto_box.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/c/crypto_hash.py b/src/nacl/c/crypto_hash.py index de6c3be5025c5c71f830d82f735f484edd5d7dfc..eef9a13fabf1baabfb378e92d37796efccf5dfb1 100644 --- a/src/nacl/c/crypto_hash.py +++ b/src/nacl/c/crypto_hash.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/c/crypto_scalarmult.py b/src/nacl/c/crypto_scalarmult.py index f8a373876535ce98e5531c0a709721688377ce5b..d3f262737fc6176a7f7569502f4514f20ab72223 100644 --- a/src/nacl/c/crypto_scalarmult.py +++ b/src/nacl/c/crypto_scalarmult.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/c/crypto_secretbox.py b/src/nacl/c/crypto_secretbox.py index e07caa9c4586e860bb18929d14f0548684d58f64..d5906f20fca2e6fa6b8318ba1b55fa12f5db3f28 100644 --- a/src/nacl/c/crypto_secretbox.py +++ b/src/nacl/c/crypto_secretbox.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/c/crypto_sign.py b/src/nacl/c/crypto_sign.py index ba6a881e6d8d3b89538e4693b44274568b1ee5e9..ddfa5a23895a4ce30c0ed46674097736fd11f3ee 100644 --- a/src/nacl/c/crypto_sign.py +++ b/src/nacl/c/crypto_sign.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/c/randombytes.py b/src/nacl/c/randombytes.py index d6f01f5157bf62c1a96db27e4e4d30ca945f2e98..a28cd88130d69e10bee1dff0d914da17046b31da 100644 --- a/src/nacl/c/randombytes.py +++ b/src/nacl/c/randombytes.py @@ -11,6 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + from __future__ import absolute_import, division, print_function from nacl._lib import lib diff --git a/src/nacl/encoding.py b/src/nacl/encoding.py index 000fae31e286ac935a8835fcf8234d5b8b879037..8c771ac802b1a3d28e7fa0f4dc66858b5280919c 100644 --- a/src/nacl/encoding.py +++ b/src/nacl/encoding.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import base64 import binascii diff --git a/src/nacl/exceptions.py b/src/nacl/exceptions.py index ae8630f5ebb3845921a34def820b7afc642c7b5d..1ba26da6accf6496dd0541aa5c29019272701e87 100644 --- a/src/nacl/exceptions.py +++ b/src/nacl/exceptions.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function class CryptoError(Exception): diff --git a/src/nacl/hash.py b/src/nacl/hash.py index 61f2f884de9601955a173b8142fc788a9351e962..ff4b711ea40518b590ce6894e49c7d912faafad9 100644 --- a/src/nacl/hash.py +++ b/src/nacl/hash.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function import nacl.c import nacl.encoding diff --git a/src/nacl/public.py b/src/nacl/public.py index 32bda571f636098b52b1f183fc01e0fd10de6403..c76bc09199dc81ef4add746776ea6653525b7f26 100644 --- a/src/nacl/public.py +++ b/src/nacl/public.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function import nacl.c import nacl.c.crypto_box diff --git a/src/nacl/secret.py b/src/nacl/secret.py index b81e7ea8ad8abddbc337ed2d2cfd6e16ef564c92..473f5565f5585bc02a106234933ead63979055bd 100644 --- a/src/nacl/secret.py +++ b/src/nacl/secret.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function import nacl.c diff --git a/src/nacl/signing.py b/src/nacl/signing.py index e9f05deec3bc32057a722997244c45ac6b0488f6..cdbfa79da227b1e408b1eab1ed9341dfaf5d06f7 100644 --- a/src/nacl/signing.py +++ b/src/nacl/signing.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function import six diff --git a/src/nacl/utils.py b/src/nacl/utils.py index 61b901cb0c47df3d1a703324cb2f3acdabaad0d0..4d555aa15f9f69d103745d46f65c655456b2cbc2 100644 --- a/src/nacl/utils.py +++ b/src/nacl/utils.py @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import absolute_import -from __future__ import division + +from __future__ import absolute_import, division, print_function import six diff --git a/tests/test_box.py b/tests/test_box.py index f378c729f1847dd31d92250e336645b00b76d4a4..492e36fc5271f0f22697f7c7dd267a09df8d4af6 100644 --- a/tests/test_box.py +++ b/tests/test_box.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import binascii import pytest diff --git a/tests/test_encoding.py b/tests/test_encoding.py index be256a26a1307318f87c661de65f1c4de9b17e71..ad6ab83aad382c090e683a9aabe4ba5e9de97193 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import pytest import nacl.encoding diff --git a/tests/test_hash.py b/tests/test_hash.py index d400e4ccd4b14415d0bf948861a2ff304b1c5a70..c8a64ce85d80af219a47d526626c1c77f07694db 100644 --- a/tests/test_hash.py +++ b/tests/test_hash.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import pytest import nacl.hash diff --git a/tests/test_raw.py b/tests/test_raw.py index f1704b83f11729ebd99c2fd0aed04cedc8417583..3d145184ca9b81efc6c30ebd7203bdfbf22479d6 100644 --- a/tests/test_raw.py +++ b/tests/test_raw.py @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +from __future__ import absolute_import, division, print_function + from binascii import hexlify, unhexlify from nacl import c import hashlib diff --git a/tests/test_secret.py b/tests/test_secret.py index a69c14bbb18cbeabfa384ca8b56a70ff7b6d9117..c9446188ae8a61b979fcf7ae597e35232347f803 100644 --- a/tests/test_secret.py +++ b/tests/test_secret.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import binascii import pytest diff --git a/tests/test_signing.py b/tests/test_signing.py index f67de340b0e6b1cead31290887564570ddc648b5..adadde8463c012db5739ea3e3c149663683cae7f 100644 --- a/tests/test_signing.py +++ b/tests/test_signing.py @@ -11,7 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from __future__ import division + +from __future__ import absolute_import, division, print_function import binascii import codecs diff --git a/tests/test_utils.py b/tests/test_utils.py index 5468cc1b21dc10b4521f88ce8703a5d422ee8048..1a303659262fe745e6841a0210726edee312644d 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -11,6 +11,9 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. + +from __future__ import absolute_import, division, print_function + import nacl.utils