pypcapkit 1.3.1.post28__tar.gz → 1.3.3.post1__tar.gz

{pypcapkit-1.3.1.post28/pypcapkit.egg-info → pypcapkit-1.3.3.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypcapkit
-Version: 1.3.1.post28
+Version: 1.3.3.post1
 Summary: PyPCAPKit: comprehensive network packet analysis library
 Author-email: Jarry Shaw <jarryshaw@icloud.com>
 Maintainer: Jarry Shaw

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1}/pcapkit/__init__.py

@@ -123,4 +123,4 @@ __all__ = [
 ]
 
 #: version number
-__version__ = '1.3.1.post28'
+__version__ = '1.3.3.post1'

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1}/pcapkit/__main__.py

@@ -120,7 +120,7 @@ def main() -> 'int':
     if args.verbose:
         try:
             print(emoji.emojize(f":police_car_light: Loading file {extractor.input!r}"))
-        except UnicodeEncodeError:
+        except (UnicodeEncodeError, NameError):  # may trigger if emoji not installed
             print(f"[*] Loading file {extractor.input!r}")
 
         for _ in extractor:
@@ -128,7 +128,7 @@ def main() -> 'int':
 
         try:
             print(emoji.emojize(f":beer_mug: Report file{'s' if args.files else ''} stored in {extractor.output!r}"))
-        except UnicodeEncodeError:
+        except (UnicodeEncodeError, NameError):  # may trigger if emoji not installed
             print(f"[*] Report file{'s' if args.files else ''} stored in {extractor.output!r}")
 
     return 0

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1}/pcapkit/utilities/decorators.py

@@ -14,7 +14,6 @@ decorators, including :func:`~pcapkit.utilities.decorators.seekset`,
 import functools
 import io
 import os
-import traceback
 from typing import TYPE_CHECKING, cast
 
 from pcapkit.utilities.exceptions import StructError, stacklevel
@@ -123,9 +122,7 @@ def beholder(func: 'Callable[Concatenate[Protocol, int, Optional[int], P], R_beh
             # error = traceback.format_exc(limit=1).strip().rsplit(os.linesep, maxsplit=1)[-1]
 
             # log error
-            logger.error(str(exc), exc_info=exc, stack_info=DEVMODE, stacklevel=stacklevel())
-            if VERBOSE:
-               traceback.print_exc()
+            logger.warning(str(exc), exc_info=exc if VERBOSE else None, stack_info=DEVMODE, stacklevel=stacklevel())
 
             file_ = self.__header__.get_payload()
             next_ = protocol(file_, length, error=str(exc))

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1}/pcapkit/utilities/exceptions.py

@@ -101,16 +101,16 @@ class BaseError(Exception):
         # log error
         if not quiet:
             if DEVMODE:
-                logger.error('%s: %s', type(self).__name__, str(self),
-                             exc_info=self if VERBOSE else False,
-                             stack_info=VERBOSE, stacklevel=-stacklevel())
+                logger.critical('%s: %s', type(self).__name__, str(self),
+                                exc_info=self if VERBOSE else False,
+                                stack_info=VERBOSE, stacklevel=-stacklevel())
             else:
-                logger.error('%s: %s', type(self).__name__, str(self))
+                logger.critical("%s: %s", type(self).__name__, str(self))
 
             # logger.error('%s: %s', type(self).__name__, str(self), exc_info=self,
             #              stack_info=True, stacklevel=-stacklevel())
         else:
-            logger.warning('%s: %s', type(self).__name__, str(self))
+            logger.error('%s: %s', type(self).__name__, str(self))
 
         if not DEVMODE:
             sys.tracebacklimit = 0

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1/pypcapkit.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pypcapkit
-Version: 1.3.1.post28
+Version: 1.3.3.post1
 Summary: PyPCAPKit: comprehensive network packet analysis library
 Author-email: Jarry Shaw <jarryshaw@icloud.com>
 Maintainer: Jarry Shaw

pypcapkit-1.3.3.post1/setup.py

@@ -0,0 +1,181 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import logging
+import os
+import sys
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from distutils.cmd import Command
+    from typing import Any, Type
+
+if sys.version_info[0] <= 2:
+    raise OSError("PyPCAPKit does not support Python 2!")
+
+try:
+    from setuptools import setup
+except ImportError:
+    raise ImportError("setuptools is required to install PyPCAPKit!")
+
+# get logger
+logger = logging.getLogger("pcapkit.setup")
+formatter = logging.Formatter(
+    fmt="[%(levelname)s] %(asctime)s - %(message)s", datefmt="%m/%d/%Y %I:%M:%S %p"
+)
+handler = logging.StreamHandler(sys.stderr)
+handler.setFormatter(formatter)
+logger.addHandler(handler)
+
+
+def get_long_description() -> "str":
+    """Extract description from README.rst, for PyPI's usage."""
+    with open("README.rst", encoding="utf-8") as file:
+        long_description = file.read()
+    return long_description
+
+
+def refactor(path: "str") -> "None":
+    """Refactor code."""
+    import subprocess  # nosec: B404
+
+    if sys.version_info < (3, 6):
+        try:
+            subprocess.check_call(  # nosec
+                [sys.executable, "-m", "f2format", "--no-archive", path]
+            )
+        except subprocess.CalledProcessError as error:
+            logger.error(
+                "Failed to perform assignment expression backport compiling. "
+                "Please consider manually install `bpc-f2format` and try again."
+            )
+            sys.exit(error.returncode)
+
+    if sys.version_info < (3, 8):
+        try:
+            subprocess.check_call(  # nosec
+                [sys.executable, "-m", "walrus", "--no-archive", path]
+            )
+        except subprocess.CalledProcessError as error:
+            logger.error(
+                "Failed to perform assignment expression backport compiling. "
+                "Please consider manually install `bpc-walrus` and try again."
+            )
+            sys.exit(error.returncode)
+
+        try:
+            subprocess.check_call(  # nosec
+                [sys.executable, "-m", "poseur", "--no-archive", path]
+            )
+        except subprocess.CalledProcessError as error:
+            logger.error(
+                "Failed to perform assignment expression backport compiling. "
+                "Please consider manually install `bpc-poseur` and try again."
+            )
+            sys.exit(error.returncode)
+
+
+cmdclass = {}  # type: dict[str, Type[Command]]
+
+try:
+    from setuptools.command.sdist import sdist
+
+    class pcapkit_sdist(sdist):
+        """Modified sdist to run PyBPC conversion."""
+
+        def make_release_tree(
+            self, base_dir: "str", *args: "Any", **kwargs: "Any"
+        ) -> "None":
+            super(pcapkit_sdist, self).make_release_tree(base_dir, *args, **kwargs)
+            logger.info("running sdist")
+
+            # PyBPC compatibility enforcement
+            refactor(os.path.join(base_dir, "pcapkit"))
+
+    cmdclass["sdist"] = pcapkit_sdist
+except ImportError:
+    logger.warning(
+        "setuptools version is too old to support PyBPC conversion in sdist."
+    )
+
+try:
+    from setuptools.command.build_py import build_py
+
+    class pcapkit_build_py(build_py):
+        """Modified build_py to run PyBPC conversion."""
+
+        def build_package_data(self) -> "None":
+            super(pcapkit_build_py, self).build_package_data()
+            logger.info("running build_py")
+
+            # PyBPC compatibility enforcement
+            refactor(os.path.join(self.build_lib, "pcapkit"))
+
+    cmdclass["build_py"] = pcapkit_build_py
+except ImportError:
+    logger.warning(
+        "setuptools version is too old to support PyBPC conversion in build_py."
+    )
+
+try:
+    from setuptools.command.develop import develop
+
+    class pcapkit_develop(develop):
+        """Modified develop to run PyBPC conversion."""
+
+        def run(self) -> "None":  # type: ignore[override]
+            super(pcapkit_develop, self).run()
+            logger.info("running develop")
+
+            # PyBPC compatibility enforcement
+            refactor(os.path.join(self.install_lib, "pcapkit"))
+
+    cmdclass["develop"] = pcapkit_develop
+except ImportError:
+    logger.warning(
+        "setuptools version is too old to support PyBPC conversion in develop."
+    )
+
+try:
+    from setuptools.command.install import install
+
+    class pcapkit_install(install):
+        """Modified install to run PyBPC conversion."""
+
+        def run(self) -> "None":
+            super(pcapkit_install, self).run()
+            logger.info("running install")
+
+            # PyBPC compatibility enforcement
+            refactor(os.path.join(self.install_lib, "pcapkit"))  # type: ignore[arg-type]
+
+    cmdclass["install"] = pcapkit_install
+except ImportError:
+    logger.warning(
+        "setuptools version is too old to support PyBPC conversion in install."
+    )
+
+try:
+    from setuptools.command.bdist_wheel import bdist_wheel
+
+    class pcapkit_bdist_wheel(bdist_wheel):
+        """Modified bdist_wheel to run PyBPC conversion."""
+
+        def run(self) -> "None":
+            super(pcapkit_bdist_wheel, self).run()
+            logger.info("running bdist_wheel")
+
+            # PyBPC compatibility enforcement
+            refactor(os.path.join(self.dist_dir, "pcapkit"))  # type: ignore[arg-type]
+
+    cmdclass["bdist_wheel"] = pcapkit_bdist_wheel
+except ImportError:
+    logger.warning(
+        "setuptools version is too old to support PyBPC conversion in bdist_wheel."
+    )
+
+setup(
+    cmdclass=cmdclass,
+    long_description=get_long_description(),
+    long_description_content_type="text/x-rst",
+)

{pypcapkit-1.3.1.post28 → pypcapkit-1.3.3.post1}/util/bump_version.py

@@ -5,9 +5,6 @@ from typing import TYPE_CHECKING, cast
 
 import pkg_resources
 
-if TYPE_CHECKING:
-    from packaging.version import Version
-
 try:
     import pcapkit
     version = pcapkit.__version__
@@ -24,7 +21,7 @@ except ImportError:
         raise RuntimeError('cannot find version')
 
 # parse version and bump version
-ver_obj = pkg_resources.parse_version(version)  # type: Version
+ver_obj = pkg_resources.parse_version(version)
 base_version = ver_obj.base_version
 
 if ver_obj.is_devrelease:

pypcapkit-1.3.1.post28/setup.py

@@ -1,140 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import logging
-import os
-import sys
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from typing import Any
-
-if sys.version_info[0] <= 2:
-    raise OSError("PyPCAPKit does not support Python 2!")
-
-try:
-    from setuptools import setup
-    from setuptools.command.bdist_wheel import bdist_wheel
-    from setuptools.command.build_py import build_py
-    from setuptools.command.develop import develop
-    from setuptools.command.install import install
-    from setuptools.command.sdist import sdist
-except ImportError:
-    raise ImportError("setuptools is required to install PyPCAPKit!")
-
-# get logger
-logger = logging.getLogger('pcapkit.setup')
-formatter = logging.Formatter(fmt='[%(levelname)s] %(asctime)s - %(message)s',
-                              datefmt='%m/%d/%Y %I:%M:%S %p')
-handler = logging.StreamHandler(sys.stderr)
-handler.setFormatter(formatter)
-logger.addHandler(handler)
-
-
-def get_long_description() -> 'str':
-    """Extract description from README.rst, for PyPI's usage."""
-    with open('README.rst', encoding='utf-8') as file:
-        long_description = file.read()
-    return long_description
-
-
-def refactor(path: 'str') -> 'None':
-    """Refactor code."""
-    import subprocess  # nosec: B404
-
-    if sys.version_info < (3, 6):
-        try:
-            subprocess.check_call(  # nosec
-                [sys.executable, '-m', 'f2format', '--no-archive', path]
-            )
-        except subprocess.CalledProcessError as error:
-            logger.error('Failed to perform assignment expression backport compiling. '
-                         'Please consider manually install `bpc-f2format` and try again.')
-            sys.exit(error.returncode)
-
-    if sys.version_info < (3, 8):
-        try:
-            subprocess.check_call(  # nosec
-                [sys.executable, '-m', 'walrus', '--no-archive', path]
-            )
-        except subprocess.CalledProcessError as error:
-            logger.error('Failed to perform assignment expression backport compiling. '
-                         'Please consider manually install `bpc-walrus` and try again.')
-            sys.exit(error.returncode)
-
-        try:
-            subprocess.check_call(  # nosec
-                [sys.executable, '-m', 'poseur', '--no-archive', path]
-            )
-        except subprocess.CalledProcessError as error:
-            logger.error('Failed to perform assignment expression backport compiling. '
-                         'Please consider manually install `bpc-poseur` and try again.')
-            sys.exit(error.returncode)
-
-
-class pcapkit_sdist(sdist):
-    """Modified sdist to run PyBPC conversion."""
-
-    def make_release_tree(self, base_dir: 'str', *args: 'Any', **kwargs: 'Any') -> 'None':
-        super(pcapkit_sdist, self).make_release_tree(base_dir, *args, **kwargs)
-        logger.info('running sdist')
-
-        # PyBPC compatibility enforcement
-        refactor(os.path.join(base_dir, 'pcapkit'))
-
-
-class pcapkit_build_py(build_py):
-    """Modified build_py to run PyBPC conversion."""
-
-    def build_package_data(self) -> 'None':
-        super(pcapkit_build_py, self).build_package_data()
-        logger.info('running build_py')
-
-        # PyBPC compatibility enforcement
-        refactor(os.path.join(self.build_lib, 'pcapkit'))
-
-
-class pcapkit_develop(develop):
-    """Modified develop to run PyBPC conversion."""
-
-    def run(self) -> 'None':  # type: ignore[override]
-        super(pcapkit_develop, self).run()
-        logger.info('running develop')
-
-        # PyBPC compatibility enforcement
-        refactor(os.path.join(self.install_lib, 'pcapkit'))
-
-
-class pcapkit_install(install):
-    """Modified install to run PyBPC conversion."""
-
-    def run(self) -> 'None':
-        super(pcapkit_install, self).run()
-        logger.info('running install')
-
-        # PyBPC compatibility enforcement
-        refactor(os.path.join(self.install_lib, 'pcapkit'))  # type: ignore[arg-type]
-
-
-class pcapkit_bdist_wheel(bdist_wheel):
-    """Modified bdist_wheel to run PyBPC conversion."""
-
-    def run(self) -> 'None':
-        super(pcapkit_bdist_wheel, self).run()
-        logger.info('running bdist_wheel')
-
-        # PyBPC compatibility enforcement
-        refactor(os.path.join(self.dist_dir, 'pcapkit'))  # type: ignore[arg-type]
-
-
-setup(
-    cmdclass={
-        'sdist': pcapkit_sdist,
-        'build_py': pcapkit_build_py,
-        'develop': pcapkit_develop,
-        'install': pcapkit_install,
-        'bdist_wheel': pcapkit_bdist_wheel,
-    },
-    long_description=get_long_description(),
-    long_description_content_type='text/x-rst',
-)