Remove cbor2 module to cbor to avoid name conflict

Author: cffls

pycardano/address.py

@@ -17,7 +17,7 @@
 from cbor2 import CBORTag
 from typing_extensions import override
 
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.crypto.bech32 import decode, encode
 from pycardano.exception import (
     DecodingException,

pycardano/backend/blockfrost.py

@@ -15,7 +15,7 @@
     GenesisParameters,
     ProtocolParameters,
 )
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.exception import TransactionFailedException
 from pycardano.hash import SCRIPT_HASH_SIZE, DatumHash, ScriptHash
 from pycardano.nativescript import NativeScript

pycardano/backend/cardano_cli.py

@@ -23,7 +23,7 @@
     GenesisParameters,
     ProtocolParameters,
 )
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.exception import (
     CardanoCliError,
     PyCardanoException,

pycardano/cbor2.py pycardano/cbor.pypycardano/cbor2.py renamed to pycardano/cbor.py

@@ -15,7 +15,7 @@
 from nacl.hash import blake2b
 from typeguard import typechecked
 
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.exception import DeserializeException, InvalidArgumentException
 from pycardano.hash import DATUM_HASH_SIZE, SCRIPT_HASH_SIZE, DatumHash, ScriptHash
 from pycardano.nativescript import NativeScript

pycardano/plutus.py

@@ -31,7 +31,7 @@
     get_type_hints,
 )
 
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.logging import logger
 
 # Remove the semantic decoder for 258 (CBOR tag for set) as we care about the order of elements

pycardano/serialization.py

@@ -12,7 +12,7 @@
 from pprintpp import pformat
 
 from pycardano.address import Address
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.certificate import Certificate
 from pycardano.exception import InvalidDataException
 from pycardano.governance import ProposalProcedure, VotingProcedures

pycardano/transaction.py

@@ -10,7 +10,7 @@
 from nacl.hash import blake2b
 
 from pycardano.backend.base import ChainContext
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.hash import SCRIPT_DATA_HASH_SIZE, SCRIPT_HASH_SIZE, ScriptDataHash
 from pycardano.plutus import COST_MODELS, CostModels, Datum, RedeemerMap, Redeemers
 from pycardano.serialization import NonEmptyOrderedSet, default_encoder

pycardano/utils.py

@@ -34,7 +34,7 @@
     VerificationKey,
     VerificationKeyWitness,
 )
-from pycardano.cbor2 import cbor2
+from pycardano.cbor import cbor2
 from pycardano.exception import (
     DeserializeException,
     InvalidKeyTypeException,