M djeploy/deploy.py +2 -2
@@ 24,7 24,7 @@ def get_releases_list(release_dir=None,
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 @@ def show_versions(release_dir=None):
release_dir = get_release_dir(release_dir)
with command.cd(release_dir):
- print command.run('ls -xt')
+ print(command.run('ls -xt'))
@task
M djeploy/globals.py +2 -2
@@ 6,7 6,7 @@ from fabric.api import *
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 @@ class Command(object):
'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)):
M djeploy/mysql.py +3 -3
@@ 14,7 14,7 @@ def get_mysql_options(extra=None, connec
'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 @@ def mysql_create_db(dbname, owner=None,
query,
connect_as=connect_as,
password=password,
- dbhost=dbhost,
- port=port,
+ dbhost=dbhost,
+ port=port,
)
M djeploy/postgresql.py +1 -1
@@ 36,7 36,7 @@ def get_pgsql_options(extra=None, connec
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