Skip to content

Commit 7260217

Browse files
author
shyamd
committed
Fix exceptions for py3
1 parent f7b4d03 commit 7260217

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

scripts/mgbuild

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#!/usr/bin/env python
2+
13
"""
24
Run derived collection builder.
35
@@ -83,7 +85,7 @@ def command_merge(args):
8385
# Connect to "core" collections.
8486
try:
8587
settings = get_settings(args.config_file)
86-
except ConfigurationError, err:
88+
except ConfigurationError as err:
8789
_log.error("command_merge.configuration")
8890
raise
8991
core_db = QueryEngine(**settings)
@@ -117,7 +119,7 @@ def command_merge(args):
117119
t0 = time.time()
118120
try:
119121
core.merge_tasks(core_collections, sandbox_collections, id_prefix, target, wipe=args.wipe_target)
120-
except pymongo.errors.DuplicateKeyError, err:
122+
except pymongo.errors.DuplicateKeyError as err:
121123
_log.error("sandbox.merge.end error=merge.duplicate_key msg={}".format(err))
122124
tell_user("\nDuplicate key error from MongoDB.\nUse -W/--wipe to clear target collection before merge.\n")
123125
return -1
@@ -195,7 +197,7 @@ def command_build(args):
195197
qe = create_qe(value, args.incr)
196198
parsed_builder_args[key] = qe
197199
query_engines.append(qe)
198-
except ValueError, err:
200+
except ValueError as err:
199201
raise ConfigurationError("creating query engine", err)
200202
elif _type in simple_types:
201203
parsed_builder_args[key] = simple_types[_type](value)
@@ -272,7 +274,7 @@ def get_settings(config_file, allow_default=True):
272274
cfg = json.load(open(DEFAULT_CONFIG_FILE))
273275
else:
274276
raise ValueError("Default configuration '{}' not found".format(DEFAULT_CONFIG_FILE))
275-
except Exception, err:
277+
except Exception as err:
276278
raise ConfigurationError(config_file, err)
277279
normalize_userpass(cfg)
278280
normalize_aliases(cfg)

0 commit comments

Comments
 (0)