fixed one edge case

benlindsay · Jan 22, 2018 · 21768a6 · 21768a6
1 parent 4ec2e47
commit 21768a6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/create_jobs/create_jobs.py b/create_jobs/create_jobs.py
@@ -119,7 +119,23 @@ def _replace_vars(text, param_dict):
         >>> _replace_vars('{last}, {first} {last}', {'last':'Bond'})
         'Bond, {first} Bond'
     """
-    return string.Formatter().vformat(text, (), _Safe_Dict(param_dict))
+    # Handle the edge case where a '{}' in text breaks things.
+    if '{}' in text:
+        text = text.replace('{}', '__dummy__')
+        contains_empty_brackets = True
+    else:
+        contains_empty_brackets = False
+
+    # TODO: Handle case where there are invalid characters inside brackets
+
+    # Run the string formatter
+    text = string.Formatter().vformat(text, (), _Safe_Dict(param_dict))
+
+    # Put empty brackets back in if they were there originally
+    if contains_empty_brackets:
+        text = text.replace('__dummy__', '{}')
+
+    return text
 
 class _Safe_Dict(dict):
     """

diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 setup(
   name = 'create_jobs',
   packages = ['create_jobs'],
-  version = '0.0.9',
+  version = '0.0.10',
   description = desc,
   long_description = long_desc,
   requires = ['numpy', 'pandas'],