Fixes #3187 - Update Python dependencies by miketaylr · Pull Request #3191 · webcompat/webcompat.com

miketaylr · 2020-02-07T23:31:07Z

Let's not land this before landing the current big batch of changes.

miketaylr · 2020-02-07T23:44:18Z

tests/unit/test_helpers.py

        self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
                         'firefox mobile')
        self.assertEqual(get_browser_name(FIREFOX_TABLET_UA),
-                         'firefox mobile (tablet)')


We should probably figure out why this changed, and if we care.

FIREFOX_TABLET_UA = 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' # noqa

which is definitely a tablet. I'm not sure why we get firefox mobile (tablet) instead of just firefox tablet but that's probably a separate issue.

webcompat.com/webcompat/helpers.py

Lines 162 to 172 in 94911bc

def get_browser_name(user_agent_string=None):

"""Return just the browser name.

unknown user agents will be reported as "unknown".

"""

if user_agent_string and isinstance(user_agent_string, str):

# get_browser will return something like 'Chrome Mobile 47.0'

# we just want 'chrome mobile', i.e., the lowercase name

# w/o the version

return get_browser(user_agent_string).rsplit(' ', 1)[0].lower()

return "unknown"

ok

return get_browser(user_agent_string).rsplit(' ', 1)[0].lower()

Let's go see what get_browser returns.

webcompat.com/webcompat/helpers.py

Lines 139 to 159 in 94911bc

def get_browser(user_agent_string=None):

"""Return browser name family and version.

It will pre-populate the bug reporting form.

"""

if user_agent_string and isinstance(user_agent_string, str):

ua_dict = user_agent_parser.Parse(user_agent_string)

ua = ua_dict.get('user_agent')

name = get_name(ua)

# if browser is unknown, we don't need further details

if name == "Unknown":

return "Unknown"

version = get_version_string(ua)

# Check for tablet devices

if ua_dict.get('device').get('model') == 'Tablet':

model = '(Tablet) '

else:

model = ''

rv = '{0} {1}{2}'.format(name, model, version).rstrip()

return rv

return "Unknown"

UA parser: 0.8

{ 'user_agent': { 'family': 'Firefox Mobile', 'major': '41', 'minor': '0', 'patch': None }, 'os': { 'family': 'Android', 'major': '4', 'minor': '4', 'patch': None, 'patch_minor': None }, 'device': { 'family': 'Generic Tablet', 'brand': 'Generic', 'model': 'Tablet' }, 'string': 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' }

UA parser: 0.9

{ 'user_agent': { 'family': 'Firefox Mobile', 'major': '41', 'minor': '0', 'patch': None }, 'os': { 'family': 'Android', 'major': '4', 'minor': '4', 'patch': None, 'patch_minor': None }, 'device': { 'family': 'rv:41.0', 'brand': 'Generic_Android', 'model': 'rv:41.0' }, 'string': 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' }

Yoohoo… that device is wow… Probably a bug in user_agent_parser.Parse(user_agent_string)

We could freeze to 0.8 then file a bug on the project. and when they fix it we can upgrade.

https://github.com/ua-parser/uap-python/issues, I'll check today if i can do a pull request on ua_parser

Opened ua-parser/uap-python#84

opened
Issue: ua-parser/uap-core#461
PR: ua-parser/uap-core#462

karlcow · 2020-02-07T23:44:54Z

config/requirements-dev.txt

 # This is for dev purpose
 -r requirements.txt
-mock==3.0.5
+mock==4.0.1


mock needs to be removed.
see #3157

coooool 👍

karlcow

@miketaylr a couple of things to adjust.

Thanks for doing the updates.

config/requirements-dev.txt

karlcow · 2020-02-10T00:49:01Z

tests/unit/test_helpers.py

        self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
                         'firefox mobile')
        self.assertEqual(get_browser_name(FIREFOX_TABLET_UA),
-                         'firefox mobile (tablet)')


FIREFOX_TABLET_UA = 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' # noqa

which is definitely a tablet. I'm not sure why we get firefox mobile (tablet) instead of just firefox tablet but that's probably a separate issue.

webcompat.com/webcompat/helpers.py

Lines 162 to 172 in 94911bc

def get_browser_name(user_agent_string=None):

"""Return just the browser name.

unknown user agents will be reported as "unknown".

"""

if user_agent_string and isinstance(user_agent_string, str):

# get_browser will return something like 'Chrome Mobile 47.0'

# we just want 'chrome mobile', i.e., the lowercase name

# w/o the version

return get_browser(user_agent_string).rsplit(' ', 1)[0].lower()

return "unknown"

ok

return get_browser(user_agent_string).rsplit(' ', 1)[0].lower()

Let's go see what get_browser returns.

webcompat.com/webcompat/helpers.py

Lines 139 to 159 in 94911bc

def get_browser(user_agent_string=None):

"""Return browser name family and version.

It will pre-populate the bug reporting form.

"""

if user_agent_string and isinstance(user_agent_string, str):

ua_dict = user_agent_parser.Parse(user_agent_string)

ua = ua_dict.get('user_agent')

name = get_name(ua)

# if browser is unknown, we don't need further details

if name == "Unknown":

return "Unknown"

version = get_version_string(ua)

# Check for tablet devices

if ua_dict.get('device').get('model') == 'Tablet':

model = '(Tablet) '

else:

model = ''

rv = '{0} {1}{2}'.format(name, model, version).rstrip()

return rv

return "Unknown"

UA parser: 0.8

{ 'user_agent': { 'family': 'Firefox Mobile', 'major': '41', 'minor': '0', 'patch': None }, 'os': { 'family': 'Android', 'major': '4', 'minor': '4', 'patch': None, 'patch_minor': None }, 'device': { 'family': 'Generic Tablet', 'brand': 'Generic', 'model': 'Tablet' }, 'string': 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' }

UA parser: 0.9

{ 'user_agent': { 'family': 'Firefox Mobile', 'major': '41', 'minor': '0', 'patch': None }, 'os': { 'family': 'Android', 'major': '4', 'minor': '4', 'patch': None, 'patch_minor': None }, 'device': { 'family': 'rv:41.0', 'brand': 'Generic_Android', 'model': 'rv:41.0' }, 'string': 'Mozilla/5.0 (Android 4.4; Tablet; rv:41.0) Gecko/41.0 Firefox/41.0' }

Yoohoo… that device is wow… Probably a bug in user_agent_parser.Parse(user_agent_string)

We could freeze to 0.8 then file a bug on the project. and when they fix it we can upgrade.

karlcow · 2020-02-10T00:52:21Z

tests/unit/test_helpers.py

        self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
                         'firefox mobile')
        self.assertEqual(get_browser_name(FIREFOX_TABLET_UA),
-                         'firefox mobile (tablet)')


https://github.com/ua-parser/uap-python/issues, I'll check today if i can do a pull request on ua_parser

karlcow · 2020-02-10T00:54:22Z

tests/unit/test_helpers.py

        self.assertEqual(get_browser_name(FIREFOX_MOBILE_UA_OLD),
                         'firefox mobile')
        self.assertEqual(get_browser_name(FIREFOX_TABLET_UA),
-                         'firefox mobile (tablet)')


Opened ua-parser/uap-python#84

miketaylr · 2020-02-10T17:26:27Z

I guess we would probably want to freeze the uap module, so to not introduce a regression.
(ah yes, I see you already wrote this :))

Thanks for filing a bug, @karlcow

miketaylr · 2020-02-10T17:49:54Z

Ah, I forgot to pip uninstall mock that's why tests were passing for me locally.

karlcow · 2020-02-10T22:28:19Z

I guess we would probably want to freeze the uap module, so to not introduce a regression.

yes. :)

karlcow

thanks @miketaylr

karlcow · 2020-02-11T08:47:34Z

I guess we would probably want to freeze the uap module, so to not introduce a regression.
(ah yes, I see you already wrote this :))

Thanks for filing a bug, @karlcow

ua-parser/uap-core@v0.6.4...master Probably changes relative to kaiOS

miketaylr · 2020-02-11T22:14:05Z

OK, ready to land now that v24.0.0 is shipping to production.

Mike Taylor added 3 commits February 7, 2020 17:29

Issue #3187 - Update Flask-WTF & Werkzeug to latest versions

f9d0af5

Issue #3187 - Fix werkzeug imports to be 1.0.0 compatible

10176a0

Issue #3187 - Update mock, Flask-Limiter & Flask-SQLAlchemy

1fde392

miketaylr commented Feb 7, 2020

View reviewed changes

karlcow reviewed Feb 7, 2020

View reviewed changes

karlcow requested changes Feb 10, 2020

View reviewed changes

Mike Taylor added 2 commits February 10, 2020 12:22

Issue #3187 - Update Pillow & python-dotenv

b349a0f

Issue #3187 - Remove mock & update usage

dc5d08c

miketaylr force-pushed the issues/3187/1 branch from d494dad to dc5d08c Compare February 10, 2020 20:23

karlcow approved these changes Feb 10, 2020

View reviewed changes

miketaylr marked this pull request as ready for review February 11, 2020 22:13

miketaylr merged commit 94d0eec into master Feb 11, 2020

miketaylr deleted the issues/3187/1 branch February 11, 2020 22:14

miketaylr added the status: add to changelog label Feb 11, 2020

karlcow removed the status: add to changelog label Feb 21, 2020

	def get_browser_name(user_agent_string=None):
	"""Return just the browser name.

	unknown user agents will be reported as "unknown".
	"""
	if user_agent_string and isinstance(user_agent_string, str):
	# get_browser will return something like 'Chrome Mobile 47.0'
	# we just want 'chrome mobile', i.e., the lowercase name
	# w/o the version
	return get_browser(user_agent_string).rsplit(' ', 1)[0].lower()
	return "unknown"

	def get_browser(user_agent_string=None):
	"""Return browser name family and version.

	It will pre-populate the bug reporting form.
	"""
	if user_agent_string and isinstance(user_agent_string, str):
	ua_dict = user_agent_parser.Parse(user_agent_string)
	ua = ua_dict.get('user_agent')
	name = get_name(ua)
	# if browser is unknown, we don't need further details
	if name == "Unknown":
	return "Unknown"
	version = get_version_string(ua)
	# Check for tablet devices
	if ua_dict.get('device').get('model') == 'Tablet':
	model = '(Tablet) '
	else:
	model = ''
	rv = '{0} {1}{2}'.format(name, model, version).rstrip()
	return rv
	return "Unknown"

Conversation

miketaylr commented Feb 7, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

karlcow left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

miketaylr commented Feb 10, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

miketaylr commented Feb 10, 2020

Uh oh!

karlcow commented Feb 10, 2020

Uh oh!

karlcow left a comment

Choose a reason for hiding this comment

Uh oh!

karlcow commented Feb 11, 2020

Uh oh!

miketaylr commented Feb 11, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

miketaylr commented Feb 10, 2020 •

edited

Loading