# HG changeset patch # User Peter Sanchez # Date 1691539357 21600 # Tue Aug 08 18:02:37 2023 -0600 # Node ID 3e16ad9a62f96a41291af8b3f9289d3d76723d94 # Parent 5e0d8278f25fd4ad94286003c2e215a8bfff7e3f Bump library to Python3 finally diff --git a/djeploy/deploy.py b/djeploy/deploy.py --- a/djeploy/deploy.py +++ b/djeploy/deploy.py @@ -24,7 +24,7 @@ releases = command.run('ls -xt', **opts) if isinstance(releases, dict): last_dir = None - for k, v in releases.iteritems(): + for k, v in releases.items(): releases[k] = sorted([x.replace('/', '') for x in v.split()]) # Verify all results match for given deploy directory @@ -120,7 +120,7 @@ release_dir = get_release_dir(release_dir) with command.cd(release_dir): - print command.run('ls -xt') + print(command.run('ls -xt')) @task diff --git a/djeploy/globals.py b/djeploy/globals.py --- a/djeploy/globals.py +++ b/djeploy/globals.py @@ -6,7 +6,7 @@ def set_env(**kwargs): - for k, v in kwargs.iteritems(): + for k, v in kwargs.items(): setattr(env, 'djeploy_%s' % k, v) return kwargs @@ -114,7 +114,7 @@ 'show': show, } - for k, v in fab_settings.iteritems(): + for k, v in fab_settings.items(): if k in manager_map: func = manager_map[k] if isinstance(v, (list, tuple)): diff --git a/djeploy/mysql.py b/djeploy/mysql.py --- a/djeploy/mysql.py +++ b/djeploy/mysql.py @@ -14,7 +14,7 @@ 'password': '-p%s' % password if password else None, } - return ' '.join([x for x in cmd_map.values() + [extra] if x]) + return ' '.join([x for x in list(cmd_map.values()) + [extra] if x]) @task @@ -136,8 +136,8 @@ query, connect_as=connect_as, password=password, - dbhost=dbhost, - port=port, + dbhost=dbhost, + port=port, ) diff --git a/djeploy/postgresql.py b/djeploy/postgresql.py --- a/djeploy/postgresql.py +++ b/djeploy/postgresql.py @@ -36,7 +36,7 @@ if createrole is not None: cmd_map['createrole'] = '-r' if createrole else '-R' - return ' '.join([x for x in cmd_map.values() + [extra] if x]) + return ' '.join([x for x in list(cmd_map.values()) + [extra] if x]) @task