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

tools: remove deprecated python api #49731

Closed
wants to merge 1 commit into from
Closed

tools: remove deprecated python api #49731

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions tools/cpplint.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import math # for log
import os
import re
import sre_compile
import string
import sys
import sysconfig
Expand All @@ -66,6 +65,16 @@

__VERSION__ = '1.6.1'

# sre_compile will be/has been removed in Python 3.13
# use re._compiler instead
# Refs: https://github.com/python/cpython/issues/105456
# Refs: https://github.com/python/cpython/issues/91308
try:
srecompile = re._compiler.compile
except AttributeError:
import sre_compile
srecompile = sre_compile.compile

try:
# -- pylint: disable=used-before-assignment
xrange # Python 2
Expand Down Expand Up @@ -1077,7 +1086,7 @@ def Match(pattern, s):
# performance reasons; factoring it out into a separate function turns out
# to be noticeably expensive.
if pattern not in _regexp_compile_cache:
_regexp_compile_cache[pattern] = sre_compile.compile(pattern)
_regexp_compile_cache[pattern] = srecompile(pattern)
return _regexp_compile_cache[pattern].match(s)


Expand All @@ -1095,14 +1104,14 @@ def ReplaceAll(pattern, rep, s):
string with replacements made (or original string if no replacements)
"""
if pattern not in _regexp_compile_cache:
_regexp_compile_cache[pattern] = sre_compile.compile(pattern)
_regexp_compile_cache[pattern] = srecompile(pattern)
return _regexp_compile_cache[pattern].sub(rep, s)


def Search(pattern, s):
"""Searches the string for the pattern, caching the compiled regexp."""
if pattern not in _regexp_compile_cache:
_regexp_compile_cache[pattern] = sre_compile.compile(pattern)
_regexp_compile_cache[pattern] = srecompile(pattern)
return _regexp_compile_cache[pattern].search(s)


Expand Down