hive-nectar 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

nectargraphenebase/unsignedtransactions.py

@@ -8,12 +8,9 @@ from collections import OrderedDict
 import ecdsa
 from asn1crypto.core import OctetString
 
-from nectargraphenebase.py23 import py23_bytes
-
 from .bip32 import parse_path
 from .chains import known_chains
 from .objects import Operation, isArgsThisClass
-from .py23 import py23_chr, string_types
 from .types import (
     Array,
     JsonObj,
@@ -46,22 +43,22 @@ class GrapheneObjectASN1(object):
 
     def __bytes__(self):
         if self.data is None:
-            return py23_bytes()
+            return bytes()
         b = b""
         output = b""
         for name, value in list(self.data.items()):
             if name == "operations":
                 for operation in value:
-                    if isinstance(value, string_types):
-                        b = py23_bytes(operation, "utf-8")
+                    if isinstance(value, str):
+                        b = bytes(operation, "utf-8")
                     else:
-                        b = py23_bytes(operation)
+                        b = bytes(operation)
                     output += OctetString(b).dump()
             elif name != "signatures":
-                if isinstance(value, string_types):
-                    b = py23_bytes(value, "utf-8")
+                if isinstance(value, str):
+                    b = bytes(value, "utf-8")
                 else:
-                    b = py23_bytes(value)
+                    b = bytes(value)
                 output += OctetString(b).dump()
         return output
 
@@ -123,7 +120,7 @@ class Unsigned_Transaction(GrapheneObjectASN1):
                 operations_count = len(kwargs["operations"])
                 # opklass = self.getOperationKlass()
                 # if all([not isinstance(a, opklass) for a in kwargs["operations"]]):
-                #    kwargs['operations'] = Array([opklass(a, prefix=prefix) for a in kwargs["operations"]])
+                #    kwargs['operations'] = Array([opklass(a, ) for a in kwargs["operations"]])
                 # else:
                 #    kwargs['operations'] = (kwargs["operations"])
 
@@ -150,7 +147,7 @@ class Unsigned_Transaction(GrapheneObjectASN1):
         self.data.pop("signatures", None)
 
         # Generage Hash of the seriliazed version
-        h = hashlib.sha256(py23_bytes(self)).digest()
+        h = hashlib.sha256(bytes(self)).digest()
 
         # recover signatures
         self.data["signatures"] = sigs
@@ -204,16 +201,16 @@ class Unsigned_Transaction(GrapheneObjectASN1):
         for name, value in list(self.data.items()):
             if name == "operations":
                 for operation in value:
-                    if isinstance(value, string_types):
-                        b = py23_bytes(operation, "utf-8")
+                    if isinstance(value, str):
+                        b = bytes(operation, "utf-8")
                     else:
-                        b = py23_bytes(operation)
+                        b = bytes(operation)
                     self.message += OctetString(b).dump()
             elif name != "signatures":
-                if isinstance(value, string_types):
-                    b = py23_bytes(value, "utf-8")
+                if isinstance(value, str):
+                    b = bytes(value, "utf-8")
                 else:
-                    b = py23_bytes(value)
+                    b = bytes(value)
                 self.message += OctetString(b).dump()
 
         self.digest = hashlib.sha256(self.message).digest()
@@ -251,16 +248,12 @@ class Unsigned_Transaction(GrapheneObjectASN1):
             if first:
                 total_size = int(len(path)) + 1 + len(chunk)
                 apdu = (
-                    unhexlify("d4040000")
-                    + py23_chr(total_size)
-                    + py23_chr(path_size)
-                    + path
-                    + chunk
+                    unhexlify("d4040000") + bytes([total_size]) + bytes([path_size]) + path + chunk
                 )
                 first = False
             else:
                 total_size = len(chunk)
-                apdu = unhexlify("d4048000") + py23_chr(total_size) + chunk
+                apdu = unhexlify("d4048000") + bytes([total_size]) + chunk
             result.append(apdu)
             offset += len(chunk)
         return result
@@ -270,14 +263,14 @@ class Unsigned_Transaction(GrapheneObjectASN1):
         if not request_screen_approval:
             return (
                 unhexlify("d4020001")
-                + py23_chr(int(len(path)) + 1)
-                + py23_chr(int(len(path) / 4))
+                + bytes([int(len(path)) + 1])
+                + bytes([int(len(path) / 4)])
                 + path
             )
         else:
             return (
                 unhexlify("d4020101")
-                + py23_chr(int(len(path)) + 1)
-                + py23_chr(int(len(path) / 4))
+                + bytes([int(len(path)) + 1])
+                + bytes([int(len(path) / 4)])
                 + path
             )

nectargraphenebase/version.py

@@ -1,3 +1,3 @@
 """THIS FILE IS GENERATED FROM nectar PYPROJECT.TOML."""
 
-version = "0.0.6"
+version = "0.0.7"

nectarstorage/masterpassword.py

@@ -8,7 +8,6 @@ from binascii import hexlify
 
 from nectargraphenebase import bip38
 from nectargraphenebase.aes import AESCipher
-from nectargraphenebase.py23 import py23_bytes
 
 from .exceptions import WalletLocked, WrongMasterPasswordException
 
@@ -192,7 +191,7 @@ class MasterPassword(object):
 
     def deriveChecksum(self, s):
         """Derive the checksum"""
-        checksum = hashlib.sha256(py23_bytes(s, "ascii")).hexdigest()
+        checksum = hashlib.sha256(bytes(s, "ascii")).hexdigest()
         return checksum[:4]
 
     def encrypt_text(self, txt):
@@ -216,7 +215,7 @@ class MasterPassword(object):
         checksum, encrypted_text = enctxt.split("$")
         try:
             decrypted_text = aes.decrypt(encrypted_text)
-        except:
+        except Exception:
             raise WrongMasterPasswordException
         if checksum != self.deriveChecksum(decrypted_text):
             raise WrongMasterPasswordException

nectargraphenebase/py23.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-PY2 = sys.version_info[0] == 2
-PY3 = sys.version_info[0] == 3
-
-
-if PY3:
-    bytes_types = (bytes,)
-    string_types = (str,)
-    integer_types = (int,)
-    text_type = str
-    binary_type = bytes
-else:
-    bytes_types = (bytes,)
-    string_types = (basestring,)  # noqa: F821
-    integer_types = (int, long)  # noqa: F821
-    text_type = unicode  # noqa: F821
-    binary_type = str
-
-
-def py23_bytes(item=None, encoding=None):
-    if item is None:
-        return b""
-    if hasattr(item, "__bytes__"):
-        return item.__bytes__()
-    else:
-        if encoding:
-            return bytes(item, encoding)
-        else:
-            return bytes(item)
-
-
-def py23_chr(item):
-    if PY2:
-        return chr(item)
-    else:
-        return bytes([item])