Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version bump, and update URL for manuf file. #35

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Version bump, and update URL for manuf file. #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a66696e
Version bump, and update URL for manuf file.
stavlor Aug 10, 2023
cfc1b3b
Do not loose Exception infos
tristanlatr Aug 10, 2023
652a572
Only run tests on python3.7 and greater
tristanlatr Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions manuf/manuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/',
Expand Down