Commit 2a048032 authored by Edward Lemur's avatar Edward Lemur Committed by LUCI CQ

my_activity: Make compatible with Python 3.

Bug: 1009820
Change-Id: I2aa619eb1cc70f7cacd27cbc2afc5c04c3a77d1f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2001224Reviewed-by: 's avatarAnthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
parent 1c3b4bec
...@@ -45,6 +45,11 @@ import fix_encoding ...@@ -45,6 +45,11 @@ import fix_encoding
import gerrit_util import gerrit_util
if sys.version_info.major == 2:
import urllib as urllib_parse
else:
import urllib.parse as urllib_parse
try: try:
import dateutil # pylint: disable=import-error import dateutil # pylint: disable=import-error
import dateutil.parser import dateutil.parser
...@@ -60,7 +65,7 @@ class DefaultFormatter(Formatter): ...@@ -60,7 +65,7 @@ class DefaultFormatter(Formatter):
self.default = default self.default = default
def get_value(self, key, args, kwds): def get_value(self, key, args, kwds):
if isinstance(key, basestring) and key not in kwds: if isinstance(key, str) and key not in kwds:
return self.default return self.default
return Formatter.get_value(self, key, args, kwds) return Formatter.get_value(self, key, args, kwds)
...@@ -327,7 +332,7 @@ class MyActivity(object): ...@@ -327,7 +332,7 @@ class MyActivity(object):
http = self.monorail_get_auth_http() http = self.monorail_get_auth_http()
url = ('https://monorail-prod.appspot.com/_ah/api/monorail/v1/projects' url = ('https://monorail-prod.appspot.com/_ah/api/monorail/v1/projects'
'/%s/issues') % project '/%s/issues') % project
query_data = urllib.urlencode(query) query_data = urllib_parse.urlencode(query)
url = url + '?' + query_data url = url + '?' + query_data
_, body = http.request(url) _, body = http.request(url)
self.show_progress() self.show_progress()
...@@ -479,7 +484,6 @@ class MyActivity(object): ...@@ -479,7 +484,6 @@ class MyActivity(object):
title, url, author, created, modified, title, url, author, created, modified,
optional_values=None): optional_values=None):
output_format = specific_fmt if specific_fmt is not None else default_fmt output_format = specific_fmt if specific_fmt is not None else default_fmt
output_format = unicode(output_format)
values = { values = {
'title': title, 'title': title,
'url': url, 'url': url,
...@@ -489,8 +493,7 @@ class MyActivity(object): ...@@ -489,8 +493,7 @@ class MyActivity(object):
} }
if optional_values is not None: if optional_values is not None:
values.update(optional_values) values.update(optional_values)
print(DefaultFormatter().format(output_format, print(DefaultFormatter().format(output_format, **values))
**values).encode(sys.getdefaultencoding()))
def filter_issue(self, issue, should_filter_by_user=True): def filter_issue(self, issue, should_filter_by_user=True):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment