pyproject.toml

@@ -1,2 +0,0 @@
-[build-system]
-requires = ["setuptools"]

requirements.txt

@@ -2,3 +2,4 @@ construct
 pyserial
 crcmod
 cmd2
+pyshark

sedbgmux-dump.py

@@ -46,7 +46,7 @@ class SEDbgMuxDumpApp:
         'auto'      : (dumpio_auto, 'Automatic dump format detection (by filename)'),
         'native'    : (DumpIONative, 'Native binary dump format for this package'),
         'socat'     : (DumpIOSocat, 'ASCII hexdump generated by socat (-x option)'),
-        'btpcap'    : (DumpIOBtPcap, 'PCAP file with Bluetooth RFCOMM packets (requires pyshark)'),
+        'btpcap'    : (DumpIOBtPcap, 'PCAP file with Bluetooth RFCOMM packets'),
     }
 
     def __init__(self, argv) -> None:

sedbgmux/io/dump_btpcap.py

@@ -19,6 +19,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import logging
+import pyshark
 
 from . import DumpIO
 from . import DumpIOError
@@ -37,14 +38,9 @@ class DumpIOBtPcap(DumpIO):
         self.timestamp = 0.0  # cached
         self.readonly = readonly
 
-        try:
-            from pyshark import FileCapture
-        except ImportError as e:
-            raise DumpIOError('pyshark is not installed') from e
-
         log.info('Opening Bluetooth RFCOMM capture %s', fname)
         dfilter = 'btrfcomm.channel == %s' % kw.get('chan', '2')
-        self._pcap = FileCapture(fname, display_filter=dfilter)
+        self._pcap = pyshark.FileCapture(fname, display_filter=dfilter)
         self._find_connect()
 
     def read(self) -> dict:

setup.py

@@ -1,26 +0,0 @@
-from setuptools import setup
-
-setup(
-    name='sedbgmux',
-    version='1.0',
-    url='https://gitea.osmocom.org/fixeria/sedbgmux',
-    license='GPLv3',
-    author='Vadim Yanitskiy',
-    author_email='fixeria@osmocom.org',
-    description='DebugMux client for [Sony] Ericsson phones and modems',
-    packages=['sedbgmux', 'sedbgmux.io', 'sedbgmux.ch'],
-    install_requires=[
-        'construct',
-        'pyserial',
-        'crcmod',
-        'cmd2 >= 2.0.0',
-    ],
-    extras_require={
-        # sedbgmux-dump.py optionally requires pyshark
-        'btpcap' : ['pyshark'],
-    },
-    scripts=[
-        'sedbgmux-shell.py',
-        'sedbgmux-dump.py',
-    ]
-)