names are tricky

src/pycfdp/handler/__init__.py → src/cfdppy/handler/__init__.py

@@ -1,5 +1,5 @@
 from spacepackets.seqcount import ProvidesSeqCount
-from pycfdp.mib import (
+from cfdppy.mib import (
     LocalEntityCfg,
     RemoteEntityCfgTable,
     RemoteEntityCfg,

src/pycfdp/handler/crc.py → src/cfdppy/handler/crc.py

@@ -5,8 +5,8 @@
 from crcmod.predefined import PredefinedCrc
 
 from spacepackets.cfdp import ChecksumType, NULL_CHECKSUM_U32
-from pycfdp.filestore import VirtualFilestore
-from pycfdp.exceptions import ChecksumNotImplemented, SourceFileDoesNotExist
+from cfdppy.filestore import VirtualFilestore
+from cfdppy.exceptions import ChecksumNotImplemented, SourceFileDoesNotExist
 
 
 def calc_modular_checksum(file_path: Path) -> bytes:

src/pycfdp/handler/dest.py → src/cfdppy/handler/dest.py

@@ -7,8 +7,8 @@
 from pathlib import Path
 from typing import Deque, List, Optional, Tuple
 
-from pycfdp.defs import CfdpState
-from pycfdp.exceptions import (
+from cfdppy.defs import CfdpState
+from cfdppy.exceptions import (
     FsmNotCalledAfterPacketInsertion,
     InvalidDestinationId,
     InvalidPduDirection,
@@ -18,23 +18,23 @@
     PduIgnoredForDestReason,
     UnretrievedPdusToBeSent,
 )
-from pycfdp.handler.common import (
+from cfdppy.handler.common import (
     PacketDestination,
     _PositiveAckProcedureParams,
     get_packet_destination,
 )
-from pycfdp.handler.crc import CrcHelper
-from pycfdp.handler.defs import (
+from cfdppy.handler.crc import CrcHelper
+from cfdppy.handler.defs import (
     _FileParamsBase,
 )
-from pycfdp.mib import (
+from cfdppy.mib import (
     CheckTimerProvider,
     EntityType,
     LocalEntityCfg,
     RemoteEntityCfg,
     RemoteEntityCfgTable,
 )
-from pycfdp.user import (
+from cfdppy.user import (
     CfdpUserBase,
     FileSegmentRecvdParams,
     MetadataRecvParams,

src/pycfdp/handler/source.py → src/cfdppy/handler/source.py

@@ -7,13 +7,13 @@
 from pathlib import Path
 from typing import Deque, Optional, Tuple
 
-from pycfdp import (
+from cfdppy import (
     CfdpUserBase,
     LocalEntityCfg,
     RemoteEntityCfg,
 )
-from pycfdp.defs import CfdpState
-from pycfdp.exceptions import (
+from cfdppy.defs import CfdpState
+from cfdppy.exceptions import (
     FsmNotCalledAfterPacketInsertion,
     InvalidDestinationId,
     InvalidNakPdu,
@@ -27,14 +27,14 @@
     SourceFileDoesNotExist,
     UnretrievedPdusToBeSent,
 )
-from pycfdp.handler.common import _PositiveAckProcedureParams
-from pycfdp.handler.crc import CrcHelper
-from pycfdp.handler.defs import (
+from cfdppy.handler.common import _PositiveAckProcedureParams
+from cfdppy.handler.crc import CrcHelper
+from cfdppy.handler.defs import (
     _FileParamsBase,
 )
-from pycfdp.mib import CheckTimerProvider, EntityType, RemoteEntityCfgTable
-from pycfdp.request import PutRequest
-from pycfdp.user import TransactionFinishedParams, TransactionParams
+from cfdppy.mib import CheckTimerProvider, EntityType, RemoteEntityCfgTable
+from cfdppy.request import PutRequest
+from cfdppy.user import TransactionFinishedParams, TransactionParams
 from spacepackets.cfdp import (
     NULL_CHECKSUM_U32,
     ChecksumType,

src/pycfdp/user.py → src/cfdppy/user.py

@@ -8,7 +8,7 @@
 from spacepackets.cfdp.pdu.file_data import SegmentMetadata
 from spacepackets.cfdp.pdu.finished import FinishedParams
 from spacepackets.util import UnsignedByteField
-from pycfdp.filestore import VirtualFilestore, HostFilestore
+from cfdppy.filestore import VirtualFilestore, HostFilestore
 
 _LOGGER = logging.getLogger(__name__)
 

tests/cfdp_fault_handler_mock.py

@@ -1,6 +1,6 @@
 from spacepackets.cfdp import ConditionCode
-from pycfdp.mib import DefaultFaultHandlerBase
-from pycfdp import TransactionId
+from cfdppy.mib import DefaultFaultHandlerBase
+from cfdppy import TransactionId
 
 
 class FaultHandler(DefaultFaultHandlerBase):

tests/cfdp_user_mock.py

@@ -1,6 +1,6 @@
 from spacepackets.cfdp import ConditionCode
-from pycfdp import CfdpUserBase, TransactionId
-from pycfdp.user import (
+from cfdppy import CfdpUserBase, TransactionId
+from cfdppy.user import (
     FileSegmentRecvdParams,
     MetadataRecvParams,
     TransactionFinishedParams,

tests/common.py

@@ -1,6 +1,6 @@
 from datetime import timedelta
 from spacepackets.util import UnsignedByteField
-from pycfdp.mib import CheckTimerProvider, EntityType
+from cfdppy.mib import CheckTimerProvider, EntityType
 from spacepackets.countdown import Countdown
 
 

tests/test_checksum.py

@@ -3,8 +3,8 @@
 from pyfakefs.fake_filesystem_unittest import TestCase
 from tempfile import gettempdir
 from pathlib import Path
-from pycfdp.handler.crc import CrcHelper, calc_modular_checksum
-from pycfdp.user import HostFilestore
+from cfdppy.handler.crc import CrcHelper, calc_modular_checksum
+from cfdppy.user import HostFilestore
 from spacepackets.cfdp import ChecksumType
 
 

tests/test_dest_handler.py

@@ -5,19 +5,19 @@
 from typing import List, Optional, cast
 from unittest.mock import MagicMock
 
-from pycfdp import (
+from cfdppy import (
     IndicationCfg,
     LocalEntityCfg,
     RemoteEntityCfg,
     RemoteEntityCfgTable,
 )
-from pycfdp.defs import CfdpState
-from pycfdp.handler.dest import (
+from cfdppy.defs import CfdpState
+from cfdppy.handler.dest import (
     DestHandler,
     FsmResult,
     TransactionStep,
 )
-from pycfdp.user import (
+from cfdppy.user import (
     FileSegmentRecvdParams,
     MetadataRecvParams,
     TransactionFinishedParams,

tests/test_dest_handler_acked.py

@@ -2,9 +2,9 @@
 import time
 from typing import List, Tuple
 
-from pycfdp.defs import CfdpState
-from pycfdp.handler.dest import FsmResult, TransactionStep
-from pycfdp.user import MetadataRecvParams, TransactionFinishedParams
+from cfdppy.defs import CfdpState
+from cfdppy.handler.dest import FsmResult, TransactionStep
+from cfdppy.user import MetadataRecvParams, TransactionFinishedParams
 from spacepackets.cfdp import (
     NULL_CHECKSUM_U32,
     ConditionCode,

tests/test_dest_handler_naked.py

@@ -5,17 +5,17 @@
 import time
 from typing import cast
 
-from pycfdp import (
+from cfdppy import (
     RemoteEntityCfgTable,
 )
-from pycfdp.defs import CfdpState
-from pycfdp.exceptions import NoRemoteEntityCfgFound
-from pycfdp.handler.dest import (
+from cfdppy.defs import CfdpState
+from cfdppy.exceptions import NoRemoteEntityCfgFound
+from cfdppy.handler.dest import (
     DestHandler,
     PduIgnoredForDest,
     TransactionStep,
 )
-from pycfdp.user import MetadataRecvParams, TransactionFinishedParams
+from cfdppy.user import MetadataRecvParams, TransactionFinishedParams
 from crcmod.predefined import mkPredefinedCrcFun
 from spacepackets.cfdp import (
     NULL_CHECKSUM_U32,

tests/test_filestore.py

@@ -3,7 +3,7 @@
 import tempfile
 
 from pyfakefs.fake_filesystem_unittest import TestCase
-from pycfdp.filestore import HostFilestore, FilestoreResult
+from cfdppy.filestore import HostFilestore, FilestoreResult
 
 
 class TestCfdpHostFilestore(TestCase):

tests/test_lost_seg_tracker.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from pycfdp.handler.dest import LostSegmentTracker
+from cfdppy.handler.dest import LostSegmentTracker
 
 
 class TestLostSegmentTracker(TestCase):

tests/test_request.py

@@ -10,7 +10,7 @@
 )
 from spacepackets.util import ByteFieldU16
 
-from pycfdp import PutRequest
+from cfdppy import PutRequest
 
 
 class TestRequest(TestCase):

tests/test_src_handler.py

@@ -5,18 +5,18 @@
 from typing import Optional, Tuple, cast
 from unittest.mock import MagicMock
 
-from pycfdp import (
+from cfdppy import (
     CfdpState,
     IndicationCfg,
     LocalEntityCfg,
     RemoteEntityCfg,
     RemoteEntityCfgTable,
 )
-from pycfdp.exceptions import UnretrievedPdusToBeSent
-from pycfdp.handler import FsmResult, SourceHandler
-from pycfdp.handler.source import TransactionStep
-from pycfdp.request import PutRequest
-from pycfdp.user import TransactionFinishedParams, TransactionParams
+from cfdppy.exceptions import UnretrievedPdusToBeSent
+from cfdppy.handler import FsmResult, SourceHandler
+from cfdppy.handler.source import TransactionStep
+from cfdppy.request import PutRequest
+from cfdppy.user import TransactionFinishedParams, TransactionParams
 from crcmod.predefined import PredefinedCrc
 from pyfakefs.fake_filesystem_unittest import TestCase
 from spacepackets.cfdp import (

tests/test_src_handler_acked.py

@@ -6,8 +6,8 @@
 from pathlib import Path
 from unittest.mock import MagicMock
 
-from pycfdp.defs import CfdpState
-from pycfdp.handler.source import TransactionStep
+from cfdppy.defs import CfdpState
+from cfdppy.handler.source import TransactionStep
 from spacepackets.cfdp import (
     NULL_CHECKSUM_U32,
     ConditionCode,

tests/test_src_handler_nak_closure.py

@@ -5,14 +5,14 @@
 from pathlib import Path
 from unittest.mock import MagicMock
 
-from pycfdp import PutRequest
-from pycfdp.defs import CfdpState
-from pycfdp.exceptions import (
+from cfdppy import PutRequest
+from cfdppy.defs import CfdpState
+from cfdppy.exceptions import (
     InvalidDestinationId,
     InvalidPduDirection,
     InvalidSourceId,
 )
-from pycfdp.handler.source import TransactionStep
+from cfdppy.handler.source import TransactionStep
 from spacepackets.cfdp import (
     ConditionCode,
     Direction,

tests/test_src_handler_nak_no_closure.py

@@ -4,11 +4,11 @@
 import tempfile
 from pathlib import Path
 
-from pycfdp.defs import CfdpState
-from pycfdp.handler import FsmResult
-from pycfdp.handler.source import TransactionStep
-from pycfdp.request import PutRequest
-from pycfdp.user import TransactionFinishedParams, TransactionParams
+from cfdppy.defs import CfdpState
+from cfdppy.handler import FsmResult
+from cfdppy.handler.source import TransactionStep
+from cfdppy.request import PutRequest
+from cfdppy.user import TransactionFinishedParams, TransactionParams
 from spacepackets.cfdp import (
     CfdpLv,
     ConditionCode,