Revert "Use pylint 2.7 for depot_tools"

This reverts commit 22bf605bb6.

Reason for revert: breaks gclient sync

Original change's description:
> Use pylint 2.7 for depot_tools
>
> This includes a few fixes for specific errors, and disables several new
> warnings introduced in this version, in order to allow for an incremental migration.
>
> Bug:1262286
> Change-Id: Ie97d686748c9c952e87718a65f401c5f6f80a5c9
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3400616
> Reviewed-by: Gavin Mak <gavinmak@google.com>
> Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>

Bug: 1262286
Change-Id: Ieb946073c7886c7bf056ce843a5a48e82becf7a5
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3413672
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
This commit is contained in:
Josip Sokcevic
2022-01-24 21:42:28 +00:00
committed by LUCI CQ
parent 22bf605bb6
commit 42c5bbbc96
39 changed files with 277 additions and 343 deletions

View File

@@ -68,7 +68,7 @@ try:
from dateutil.relativedelta import relativedelta
except ImportError:
logging.error('python-dateutil package required')
sys.exit(1)
exit(1)
class DefaultFormatter(Formatter):
@@ -76,11 +76,10 @@ class DefaultFormatter(Formatter):
super(DefaultFormatter, self).__init__()
self.default = default
def get_value(self, key, args, kwargs):
if isinstance(key, str) and key not in kwargs:
def get_value(self, key, args, kwds):
if isinstance(key, str) and key not in kwds:
return self.default
return Formatter.get_value(self, key, args, kwargs)
return Formatter.get_value(self, key, args, kwds)
gerrit_instances = [
{
@@ -169,10 +168,9 @@ def get_week_of(date):
def get_yes_or_no(msg):
while True:
response = gclient_utils.AskForData(msg + ' yes/no [no] ')
if response in ('y', 'yes'):
if response == 'y' or response == 'yes':
return True
if not response or response in ('n', 'no'):
elif not response or response == 'n' or response == 'no':
return False
@@ -412,7 +410,7 @@ class MyActivity(object):
return [
issue for issue in issues
if user_str in (issue['author'], issue['owner'])]
if issue['author'] == user_str or issue['owner'] == user_str]
def monorail_get_issues(self, project, issue_ids):
return self.monorail_query_issues(project, {
@@ -533,7 +531,7 @@ class MyActivity(object):
return True
def filter_modified(self, modified):
return self.modified_after < modified < self.modified_before
return self.modified_after < modified and modified < self.modified_before
def auth_for_changes(self):
#TODO(cjhopman): Move authentication check for getting changes here.
@@ -688,12 +686,12 @@ class MyActivity(object):
return output
class PythonObjectEncoder(json.JSONEncoder):
def default(self, o): # pylint: disable=method-hidden
if isinstance(o, datetime):
return o.isoformat()
if isinstance(o, set):
return list(o)
return json.JSONEncoder.default(self, o)
def default(self, obj): # pylint: disable=method-hidden
if isinstance(obj, datetime):
return obj.isoformat()
if isinstance(obj, set):
return list(obj)
return json.JSONEncoder.default(self, obj)
output = {
'reviews': format_for_json_dump(self.reviews),
@@ -920,16 +918,16 @@ def main():
config = json.load(f)
for item, entries in config.items():
if item == 'gerrit_instances':
for repo, dic in entries.items():
# Use property name as URL
dic['url'] = repo
gerrit_instances.append(dic)
elif item == 'monorail_projects':
monorail_projects.append(entries)
else:
logging.error('Invalid entry in config file.')
return 1
if item == 'gerrit_instances':
for repo, dic in entries.items():
# Use property name as URL
dic['url'] = repo
gerrit_instances.append(dic)
elif item == 'monorail_projects':
monorail_projects.append(entries)
else:
logging.error('Invalid entry in config file.')
return 1
my_activity = MyActivity(options)
my_activity.show_progress('Loading data')