bugfix for #58

Author: Jarry XIAO

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "python.pythonPath": ".venv/bin/python",
     "cSpell.words": [
         "Acked",
         "Chksum",
@@ -16,6 +15,7 @@
         "ISDN",
         "NPROCESSORS",
         "Oopt",
+        "PCAPIO",
         "PROTO",
         "RCVBT",
         "RHASH",
@@ -113,6 +113,7 @@
         "fpout",
         "fproot",
         "frnum",
+        "fstring",
         "gaocegege",
         "gbhdr",
         "genc",

pcapkit/all.py

@@ -9,7 +9,7 @@
 
 """
 import pcapkit.const as const
-# import pcapkit.vendor as vendor
+#import pcapkit.vendor as vendor
 from pcapkit.corekit import *
 from pcapkit.dumpkit import *
 from pcapkit.foundation import *
@@ -32,7 +32,7 @@
     'VersionInfo',                                          # Version
 
     # pcapkit.dumpkit
-    'PCAP',                                                 # PCAP Dumper
+    'PCAPIO',                                                 # PCAP Dumper
     'NotImplementedIO',                                     # Simulated I/O
 
     # pcapkit.foundation

pcapkit/dumpkit/__init__.py

@@ -13,7 +13,7 @@
 from pcapkit.protocols.pcap.frame import Frame
 from pcapkit.protocols.pcap.header import Header
 
-__all__ = ['PCAP', 'NotImplementedIO']
+__all__ = ['PCAPIO', 'NotImplementedIO']
 
 
 class NotImplementedIO(dictdumper.Dumper):
@@ -70,7 +70,7 @@ def _append_value(self, value, file, name):  # pylint: disable=unused-argument
         """
 
 
-class PCAP(dictdumper.Dumper):
+class PCAPIO(dictdumper.Dumper):
     """PCAP file dumper."""
 
     ##########################################################################

pcapkit/foundation/extraction.py

@@ -90,7 +90,7 @@
 # CPU number
 if os.name == 'posix' and 'SC_NPROCESSORS_CONF' in os.sysconf_names:
     CPU_CNT = os.sysconf('SC_NPROCESSORS_CONF')
-elif 'sched_getaffinity' in os.__all__:
+elif 'sched_getaffinity' in os.__all__:  # type: ignore
     CPU_CNT = len(os.sched_getaffinity(0))  # pylint: disable=E1101
 else:
     CPU_CNT = os.cpu_count() or 1
@@ -1417,7 +1417,7 @@ def _analyse_frame(*, frame, mpkit):
             """Analyse frame."""
             # wait until ready
             while mpkit.current != self._frnum:
-                time.sleep(random.randint(0, datetime.datetime.now().second) // 600)
+                time.sleep(random.randint(0, datetime.datetime.now().second) // 600)  # nosec
 
             # analysis and storage
             # print(self._frnum, 'get')

pcapkit/foundation/traceflow.py

@@ -130,7 +130,7 @@ def make_fout(fout='./tmp', fmt='pcap'):
             fout = './tmp'
 
         if fmt == 'pcap':       # output PCAP file
-            from pcapkit.dumpkit import PCAP as output
+            from pcapkit.dumpkit import PCAPIO as output
         elif fmt == 'plist':    # output PLIST file
             from dictdumper import PLIST as output
         elif fmt == 'json':     # output JSON file

pcapkit/utilities/exceptions.py

@@ -18,6 +18,8 @@
 from pcapkit.utilities.compat import ModuleNotFoundError  # pylint: disable=redefined-builtin
 
 __all__ = [
+    'stacklevel',
+
     'BaseError',                                                    # Exception
     'DigitError', 'IntError', 'RealError', 'ComplexError',          # TypeError
     'BoolError', 'BytesError', 'StringError', 'BytearrayError',     # TypeError

pcapkit/vendor/default.py

@@ -376,7 +376,7 @@ def _request(self):
 
                     while True:
                         with contextlib.suppress(Exception):
-                            input('Press ENTER to continue...')
+                            input('Press ENTER to continue...')  # nosec
                         if os.path.isfile(temp_file):
                             break
                         print('File not found; please save the page source at')