From c4ab34a0496843f687bac503c5fc83f3f2f5e66b Mon Sep 17 00:00:00 2001 From: NNTin Date: Thu, 13 Dec 2018 18:28:01 +0100 Subject: [PATCH] V3: regex extension on java -version (#2316) * regex extension on java -version * make it a non capturing group * alphanumeric matching * Match specification: Style, line length * Update manager.py --- redbot/cogs/audio/manager.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/redbot/cogs/audio/manager.py b/redbot/cogs/audio/manager.py index df8649279..ae10bb3be 100644 --- a/redbot/cogs/audio/manager.py +++ b/redbot/cogs/audio/manager.py @@ -71,7 +71,9 @@ async def get_java_version(loop) -> _JavaVersion: # ... version "MAJOR.MINOR.PATCH[_BUILD]" ... # ... # We only care about the major and minor parts though. - version_line_re = re.compile(r'version "(?P\d+).(?P\d+).\d+(?:_\d+)?"') + version_line_re = re.compile( + r'version "(?P\d+).(?P\d+).\d+(?:_\d+)?(?:-[A-Za-z0-9]+)?"' + ) short_version_re = re.compile(r'version "(?P\d+)"') lines = version_info.splitlines()