Skip to content

syntax updates suggested by python 2to3 tool #3

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

Open
mathemagica wants to merge 1 commit into
base: main
Choose a base branch
from
Open

syntax updates suggested by python 2to3 tool #3

Show file tree
Hide file tree
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
12 changes: 6 additions & 6 deletions ak-event-merge/merge.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def main(args):
next = False
offset = 0
while next is not None:
print('Loading TO event signups ... %s' % offset)
print(('Loading TO event signups ... %s' % offset))
reponse = ak.list_signups(query_params={
'event': args.TO_EVENT,
'_limit': 100,
Expand All @@ -59,7 +59,7 @@ def main(args):
next = False
offset = 0
while next is not None:
print('Loading hosts ... %s' % offset)
print(('Loading hosts ... %s' % offset))
host_reponse = ak.list_signups(query_params={
'event': args.FROM_EVENT,
'role': 'host',
Expand All @@ -71,7 +71,7 @@ def main(args):
hosts += host_reponse.get('objects')
# Save hosts TO event.
for index, host in enumerate(hosts):
print('Adding hosts ... %s/%s' % (index + 1, len(hosts)))
print(('Adding hosts ... %s/%s' % (index + 1, len(hosts))))
user_id = re.findall(r'/(\d+)/?$', host.get('user'))[0]
if not to_signups.get(user_id, False):
ak.create_signup(user_id, args.TO_EVENT, args.SIGNUP_PAGE, role='host', fields={'source': 'ak-event-merge'})
Expand All @@ -82,7 +82,7 @@ def main(args):
next = False
offset = 0
while next is not None:
print('Loading FROM attendees ... %s' % offset)
print(('Loading FROM attendees ... %s' % offset))
attendee_response = ak.list_signups(query_params={
'event': args.FROM_EVENT,
'role': 'attendee',
Expand All @@ -94,7 +94,7 @@ def main(args):
attendees += attendee_response.get('objects')
# Save attendees TO event.
for index, attendee in enumerate(attendees):
print('Adding attendees ... %s/%s' % (index + 1, len(attendees)))
print(('Adding attendees ... %s/%s' % (index + 1, len(attendees))))
user_id = re.findall(r'/(\d+)/?$', attendee.get('user'))[0]
if not to_signups.get(user_id, False):
ak.create_signup(user_id, args.TO_EVENT, args.SIGNUP_PAGE, role='attendee', fields={'source': 'ak-event-merge'})
Expand All @@ -119,7 +119,7 @@ def main(args):
)
pp = pprint.PrettyPrinter(indent=2)

for argname, helptext in ARG_DEFINITIONS.items():
for argname, helptext in list(ARG_DEFINITIONS.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down
6 changes: 3 additions & 3 deletions ak-replace-host/entry_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def all_required_args_set(args, required, definitions) -> bool:

for arg in required:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (definitions.get(arg), arg))
print(('%s (%s) required, missing.' % (definitions.get(arg), arg)))
set = False

return set
Expand All @@ -28,7 +28,7 @@ def run_from_cli(func, description, definitions, required) -> None:

parser = argparse.ArgumentParser(description=description)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down Expand Up @@ -68,7 +68,7 @@ def run_from_lamba(func, description, definitions, required, event) -> str:
for argname in kwargs:
event[argname] = kwargs.get(argname)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
if not event.get(argname, False):
event[argname] = getattr(settings, argname, False)

Expand Down
2 changes: 1 addition & 1 deletion ak-replace-host/get_results_from_mysql_query_with_params.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def main(args) -> list:
print('QUERY or SQL parameter required, both missing.')
return []
params = parse_qs(args.PARAMS)
for key, value in params.items():
for key, value in list(params.items()):
args.QUERY = args.QUERY.replace('{{%s}}' % key, value[0])
connection = pymysql.connect(
host=args.MYSQL_DB_HOST,
Expand Down
6 changes: 3 additions & 3 deletions gdpr-cleanup/entry_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def all_required_args_set(args, required, definitions) -> bool:

for arg in required:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (definitions.get(arg), arg))
print(('%s (%s) required, missing.' % (definitions.get(arg), arg)))
set = False

return set
Expand All @@ -28,7 +28,7 @@ def run_from_cli(func, description, definitions, required) -> None:

parser = argparse.ArgumentParser(description=description)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down Expand Up @@ -68,7 +68,7 @@ def run_from_lamba(func, description, definitions, required, event) -> str:
for argname in kwargs:
event[argname] = kwargs.get(argname)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
if not event.get(argname, False):
event[argname] = getattr(settings, argname, False)

Expand Down
2 changes: 1 addition & 1 deletion kos-imports/correct_columns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def main(args) -> str:
reader = csv.reader(input_file)
headers = next(reader)

for old, new in parse_qs(args.CORRECTIONS).items():
for old, new in list(parse_qs(args.CORRECTIONS).items()):
if old in headers:
headers[headers.index(old)] = new[0]

Expand Down
4 changes: 2 additions & 2 deletions kos-imports/entry_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def all_required_args_set(args, required, definitions) -> bool:

for arg in required:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (definitions.get(arg), arg))
print(('%s (%s) required, missing.' % (definitions.get(arg), arg)))
set = False

return set
Expand All @@ -28,7 +28,7 @@ def run_from_cli(func, description, definitions, required) -> None:

parser = argparse.ArgumentParser(description=description)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down
6 changes: 3 additions & 3 deletions propensity-cleanup/cleanup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def main(args):

for arg in REQUIRED_ARGS:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (ARG_DEFINITIONS.get(arg), arg))
print(('%s (%s) required, missing.' % (ARG_DEFINITIONS.get(arg), arg)))
all_required_args_set = False

if all_required_args_set:
Expand Down Expand Up @@ -65,7 +65,7 @@ def main(args):
table_dates[table] = table_date(table)
today = datetime.today()
month_ago = today - timedelta(days=30)
old_tables = [table for table in table_dates.keys() if table_dates[table] < month_ago][:100]
old_tables = [table for table in list(table_dates.keys()) if table_dates[table] < month_ago][:100]
for table in old_tables:
database_cursor.execute("""
DROP TABLE signature_propensity.%s
Expand All @@ -86,7 +86,7 @@ def main(args):
)
pp = pprint.PrettyPrinter(indent=2)

for argname, helptext in ARG_DEFINITIONS.items():
for argname, helptext in list(ARG_DEFINITIONS.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down
4 changes: 2 additions & 2 deletions s3-to-redshift/entry_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def all_required_args_set(args, required, definitions) -> bool:

for arg in required:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (definitions.get(arg), arg))
print(('%s (%s) required, missing.' % (definitions.get(arg), arg)))
set = False

return set
Expand All @@ -28,7 +28,7 @@ def run_from_cli(func, description, definitions, required) -> None:

parser = argparse.ArgumentParser(description=description)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down
6 changes: 3 additions & 3 deletions target-tracking/entry_points.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def all_required_args_set(args, required, definitions) -> bool:

for arg in required:
if not getattr(args, arg, False):
print('%s (%s) required, missing.' % (definitions.get(arg), arg))
print(('%s (%s) required, missing.' % (definitions.get(arg), arg)))
set = False

return set
Expand All @@ -28,7 +28,7 @@ def run_from_cli(func, description, definitions, required) -> None:

parser = argparse.ArgumentParser(description=description)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
parser.add_argument(
'--%s' % argname, dest=argname, help=helptext,
default=getattr(settings, argname, False)
Expand Down Expand Up @@ -68,7 +68,7 @@ def run_from_lamba(func, description, definitions, required, event) -> str:
for argname in kwargs:
event[argname] = kwargs.get(argname)

for argname, helptext in definitions.items():
for argname, helptext in list(definitions.items()):
if not event.get(argname, False):
event[argname] = getattr(settings, argname, False)

Expand Down