From a66696e04a71d5a3ef2660783e52d12e21fee890 Mon Sep 17 00:00:00 2001 From: Paul Andrel Date: Thu, 10 Aug 2023 12:45:25 -0400 Subject: [PATCH 1/3] Version bump, and update URL for manuf file. --- manuf/manuf.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manuf/manuf.py b/manuf/manuf.py index e5e9193..3e1ee9d 100755 --- a/manuf/manuf.py +++ b/manuf/manuf.py @@ -61,7 +61,7 @@ class MacParser(object): IOError: If manuf file could not be found. """ - MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/master/manuf" + MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf" WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka" def __init__(self, manuf_name=None, update=False): diff --git a/setup.py b/setup.py index 4795157..c77f944 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name = 'manuf', packages = ['manuf'], - version = '1.1.5', + version = '1.1.6', description = 'Parser library for Wireshark\'s OUI database', author = 'Michael Huang', url = 'https://github.com/coolbho3k/manuf/', From cfc1b3bad906e387d90a4a4ed71c8a53cefaaf40 Mon Sep 17 00:00:00 2001 From: tristanlatr <19967168+tristanlatr@users.noreply.github.com> Date: Thu, 10 Aug 2023 12:56:34 -0400 Subject: [PATCH 2/3] Do not loose Exception infos --- manuf/manuf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manuf/manuf.py b/manuf/manuf.py index 3e1ee9d..949e09f 100755 --- a/manuf/manuf.py +++ b/manuf/manuf.py @@ -142,8 +142,8 @@ def update(self, manuf_url=None, wfa_url=None, manuf_name=None, refresh=True): # Retrieve the new database try: response = urlopen(Request(manuf_url, headers={'User-Agent': 'Mozilla'})) - except URLError: - raise URLError("Failed downloading OUI database") + except URLError as e: + raise URLError("Failed downloading OUI database") from e # Parse the response if response.code == 200: @@ -162,8 +162,8 @@ def update(self, manuf_url=None, wfa_url=None, manuf_name=None, refresh=True): # Append WFA to new database try: response = urlopen(Request(wfa_url, headers={'User-Agent': 'Mozilla'})) - except URLError: - raise URLError("Failed downloading WFA database") + except URLError as e: + raise URLError("Failed downloading WFA database") from e # Parse the response if response.code == 200: From 652a57269403f551ba99304c58e8548e399b9374 Mon Sep 17 00:00:00 2001 From: tristanlatr <19967168+tristanlatr@users.noreply.github.com> Date: Thu, 10 Aug 2023 13:02:43 -0400 Subject: [PATCH 3/3] Only run tests on python3.7 and greater --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2976f05..c388cd4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-latest, macos-latest] - python-version: ['2.7','3.5','3.6','3.7','3.8'] + python-version: ['3.7','3.8', '3.9', '3.10', '3.11'] fail-fast: false steps: - uses: actions/checkout@v1