From 8dca1dabe7759924d853fb63cd138768fc61de47 Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Wed, 18 Jan 2023 02:45:22 +0000 Subject: [PATCH] grit: remove dependency to six Bug: 1406153 Change-Id: I2cf74b2885b640c9639971d509038e08c2c5d157 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4173416 Auto-Submit: Takuto Ikuta Commit-Queue: Andrew Grieve Reviewed-by: Andrew Grieve Cr-Commit-Position: refs/heads/main@{#1093706} --- tools/binary_size/supersize.pydeps | 1 - tools/grit/BUILD.gn | 1 - tools/grit/grit/__init__.py | 9 --------- tools/grit/grit/clique.py | 2 -- tools/grit/grit/grd_reader.py | 2 -- tools/grit/grit/tclib.py | 2 -- tools/grit/grit/tool/android2grd.py | 1 - tools/grit/grit/tool/build.py | 2 -- tools/grit/grit/tool/menu_from_parts.py | 2 -- tools/grit/grit/tool/rc2grd.py | 1 - tools/grit/grit/tool/xmb.py | 2 -- tools/grit/grit/util_unittest.py | 2 -- tools/grit/pak_util.py | 6 ------ tools/grit/setup.py | 4 ---- 14 files changed, 37 deletions(-) diff --git a/tools/grit/grit/clique.py b/tools/grit/grit/clique.py index 01560f6e44b183..714b9e70789873 100644 --- a/tools/grit/grit/clique.py +++ b/tools/grit/grit/clique.py @@ -9,8 +9,6 @@ import re -import six - from grit import constants from grit import exception from grit import lazy_re diff --git a/tools/grit/grit/grd_reader.py b/tools/grit/grit/grd_reader.py index 5cc3702d8914d0..99ed30f12c15cb 100755 --- a/tools/grit/grit/grd_reader.py +++ b/tools/grit/grit/grd_reader.py @@ -12,8 +12,6 @@ import xml.sax import xml.sax.handler -import six - from grit import exception from grit import util from grit.node import mapping diff --git a/tools/grit/grit/tclib.py b/tools/grit/grit/tclib.py index cb237646c899b5..b14f5ec2d9161f 100644 --- a/tools/grit/grit/tclib.py +++ b/tools/grit/grit/tclib.py @@ -9,8 +9,6 @@ import functools import re -import six - from grit import exception from grit import lazy_re import grit.extern.tclib diff --git a/tools/grit/grit/tool/build.py b/tools/grit/grit/tool/build.py index 664b9f6e6d3f0e..f3f61c4cf29aeb 100644 --- a/tools/grit/grit/tool/build.py +++ b/tools/grit/grit/tool/build.py @@ -15,8 +15,6 @@ import shutil import sys -import six - from grit import grd_reader from grit import shortcuts from grit import util diff --git a/tools/grit/grit/tool/menu_from_parts.py b/tools/grit/grit/tool/menu_from_parts.py index 7e0466a85ee95d..075edc8d4c5d17 100644 --- a/tools/grit/grit/tool/menu_from_parts.py +++ b/tools/grit/grit/tool/menu_from_parts.py @@ -5,8 +5,6 @@ '''The 'grit menufromparts' tool.''' -import six - from grit import grd_reader from grit import util from grit import xtb_reader diff --git a/tools/grit/grit/tool/xmb.py b/tools/grit/grit/tool/xmb.py index 1c27d8ac335841..646bdd9238fba1 100644 --- a/tools/grit/grit/tool/xmb.py +++ b/tools/grit/grit/tool/xmb.py @@ -12,8 +12,6 @@ from xml.sax import saxutils -import six - from grit import grd_reader from grit import lazy_re from grit import tclib diff --git a/tools/grit/grit/util_unittest.py b/tools/grit/grit/util_unittest.py index 342d7c238ea7f2..71640dfc1fb460 100755 --- a/tools/grit/grit/util_unittest.py +++ b/tools/grit/grit/util_unittest.py @@ -14,8 +14,6 @@ import unittest -import six - from grit import util diff --git a/tools/grit/setup.py b/tools/grit/setup.py index cc2d80afa009ca..3784add67cb5fb 100755 --- a/tools/grit/setup.py +++ b/tools/grit/setup.py @@ -16,9 +16,6 @@ 'console_scripts': ['grit = grit.grit_runner:Main'], }, packages=setuptools.find_packages(), - install_requires=[ - 'six >= 1.10', - ], author='The Chromium Authors', author_email='chromium-dev@chromium.org', description=('Google Resource and Internationalization Tool for managing ' @@ -34,7 +31,6 @@ 'Operating System :: Microsoft :: Windows', 'Operating System :: POSIX :: Linux', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7',