Unify quotes

diff --git a/pygost/asn1schemas/x509.py b/pygost/asn1schemas/x509.py
index ce30f62bd4948197aaf6dce5033b175c1474752b..188ef3a6126ee3a1d02f5ede5e97ea18bc6572ad 100644 (file)
--- a/pygost/asn1schemas/x509.py
+++ b/pygost/asn1schemas/x509.py
@@ -140,8 +140,8 @@ class SubjectKeyIdentifier(KeyIdentifier):
 
 class BasicConstraints(Sequence):
     schema = (
-        ('cA', Boolean(default=False)),
-        # ('pathLenConstraint', PathLenConstraint(optional=True)),
+        ("cA", Boolean(default=False)),
+        # ("pathLenConstraint", PathLenConstraint(optional=True)),
     )
 
 

diff --git a/pygost/gost34112012256.py b/pygost/gost34112012256.py
index 1f3c62cfd10b082668d6fce2c53506461e1e80b6..865847dc8d33f93c88d41987fdae8ff94fefce4b 100644 (file)
--- a/pygost/gost34112012256.py
+++ b/pygost/gost34112012256.py
@@ -8,9 +8,9 @@ from pygost.gost34112012 import GOST34112012
 
 
 class GOST34112012256(GOST34112012):
-    def __init__(self, data=b''):
+    def __init__(self, data=b""):
         super(GOST34112012256, self).__init__(data, digest_size=32)
 
 
-def new(data=b''):
+def new(data=b""):
     return GOST34112012256(data)

diff --git a/pygost/gost34112012512.py b/pygost/gost34112012512.py
index 707397da0245e5fa5f75e8dc7be5ad5856f107c7..f02b061b548ea2706c49284185991e3ddb2868bd 100644 (file)
--- a/pygost/gost34112012512.py
+++ b/pygost/gost34112012512.py
@@ -9,11 +9,11 @@ from pygost.pbkdf2 import pbkdf2 as pbkdf2_base
 
 
 class GOST34112012512(GOST34112012):
-    def __init__(self, data=b''):
+    def __init__(self, data=b""):
         super(GOST34112012512, self).__init__(data, digest_size=64)
 
 
-def new(data=b''):
+def new(data=b""):
     return GOST34112012512(data)
 
 

diff --git a/pygost/gost3413.py b/pygost/gost3413.py
index 5aeaec63ef415091ae3de81b64facb57e0af62bd..ec16f8c6b0903f73d78a3e4ee2602722d6973bc8 100644 (file)
--- a/pygost/gost3413.py
+++ b/pygost/gost3413.py
@@ -274,7 +274,7 @@ Rb128 = 0b10000111
 
 def _mac_ks(encrypter, bs):
     Rb = Rb128 if bs == 16 else Rb64
-    _l = encrypter(bs * b'\x00')
+    _l = encrypter(bs * b"\x00")
     k1 = _mac_shift(bs, _l, Rb) if bytearray(_l)[0] & 0x80 > 0 else _mac_shift(bs, _l)
     k2 = _mac_shift(bs, k1, Rb) if bytearray(k1)[0] & 0x80 > 0 else _mac_shift(bs, k1)
     return k1, k2
@@ -294,7 +294,7 @@ def mac(encrypter, bs, data):
         tail_offset = len(data) - bs
     else:
         tail_offset = len(data) - (len(data) % bs)
-    prev = bs * b'\x00'
+    prev = bs * b"\x00"
     for i in xrange(0, tail_offset, bs):
         prev = encrypter(strxor(data[i:i + bs], prev))
     tail = data[tail_offset:]
@@ -337,7 +337,7 @@ def mac_acpkm_master(algo_class, encrypter, key_section_size, section_size, bs,
         tail_offset = len(data) - bs
     else:
         tail_offset = len(data) - (len(data) % bs)
-    prev = bs * b'\x00'
+    prev = bs * b"\x00"
     sections = len(data) // section_size
     if len(data) % section_size != 0:
         sections += 1

diff --git a/pygost/pbkdf2.py b/pygost/pbkdf2.py
index d1e07a69a39ff85b8e5a759b38bd22f8974a63fb..4bef6c6ea07b0c95d56bd892c129cc12054be7bb 100644 (file)
--- a/pygost/pbkdf2.py
+++ b/pygost/pbkdf2.py
@@ -28,7 +28,7 @@ def pbkdf2(hasher, password, salt, iterations, dklen):
         ocpy.update(icpy.digest())
         return ocpy.digest()
 
-    dkey = b''
+    dkey = b""
     loop = 1
     while len(dkey) < dklen:
         prev = prf(salt + long2bytes(loop, 4))

diff --git a/pygost/test_pfx.py b/pygost/test_pfx.py
index 67fe788298a5feb82ce1bb584912f1775d384919..6f066431eda3f5e32a244ebded8132ea060be82c 100644 (file)
--- a/pygost/test_pfx.py
+++ b/pygost/test_pfx.py
@@ -72,7 +72,7 @@ AwcBAQIDBEAIFX0fyZe20QKKhWm6WYX+S92Gt6zaXroXOvAmayzLfZ5Sd9C2t9zZ
 JSg6M8RBUYpw/8ym5ou1o2nDa09M5zF3BCCpzyCQBI+rzfISeKvPV1ROfcXiYU93
 mwcl1xQV2G5/fgICB9A=
     """)
-    password = u'Пароль для PFX'
+    password = u"Пароль для PFX"
 
     def test_shrouded_key_bag(self):
         private_key_info_expected = b64decode(b"""
@@ -162,7 +162,7 @@ ATAMBggqhQMHAQEDAgUAA0EA9oq0Vvk8kkgIwkp0x0J5eKtia4MNTiwKAm7jgnCZIx3O98BThaTX
         _, outer_safe_contents = pfx["authSafe"]["content"].defined
         mac_data = pfx["macData"]
         mac_key = gost34112012_pbkdf2(
-            password=self.password.encode('utf-8'),
+            password=self.password.encode("utf-8"),
             salt=bytes(mac_data["macSalt"]),
             iterations=int(mac_data["iterations"]),
             dklen=96,

diff --git a/setup.py b/setup.py
index a49e097f6ca0f4bc08561c2b31a86cd882145117..3daacac876dda85983d10bd9564abebefb239176 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
         "pygost": ["stubs/**/*.pyi"],
     },
     data_files=(
-        ('', (
+        ("", (
             "AUTHORS",
             "COPYING",
             "FAQ",