diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2016-05-27 11:58:21 -0700 |
| commit | 8d61a99ff722a707e2807b6a9a6ff84b30a09bf8 (patch) | |
| tree | 8ea8c1ff8eb9d6a3e970ae083abaa06e06210b13 /grc/core/utils/expr_utils.py | |
| parent | 5c910950a0c872a52c8dc875b0c108c0f2609c30 (diff) | |
| parent | cc02c4b22a2e17eddfc05863a9f17fb9a5778361 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'grc/core/utils/expr_utils.py')
| -rw-r--r-- | grc/core/utils/expr_utils.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/grc/core/utils/expr_utils.py b/grc/core/utils/expr_utils.py index c5069583e0..2059ceff9f 100644 --- a/grc/core/utils/expr_utils.py +++ b/grc/core/utils/expr_utils.py @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ import string -VAR_CHARS = string.letters + string.digits + '_.' +VAR_CHARS = string.letters + string.digits + '_' class graph(object): @@ -56,7 +56,7 @@ class graph(object): return self._graph[node_key] -def expr_split(expr): +def expr_split(expr, var_chars=VAR_CHARS): """ Split up an expression by non alphanumeric characters, including underscore. Leave strings in-tact. @@ -72,7 +72,7 @@ def expr_split(expr): tok = '' quote = '' for char in expr: - if quote or char in VAR_CHARS: + if quote or char in var_chars: if char == quote: quote = '' tok += char @@ -99,7 +99,7 @@ def expr_replace(expr, replace_dict): Returns: a new expression with the prepend """ - expr_splits = expr_split(expr) + expr_splits = expr_split(expr, var_chars=VAR_CHARS + '.') for i, es in enumerate(expr_splits): if es in replace_dict.keys(): expr_splits[i] = replace_dict[es] @@ -189,8 +189,3 @@ def sort_objects(objects, get_id, get_expr): sorted_ids = sort_variables(id2expr) # Return list of sorted objects return [id2obj[id] for id in sorted_ids] - - -if __name__ == '__main__': - for i in sort_variables({'x': '1', 'y': 'x+1', 'a': 'x+y', 'b': 'y+1', 'c': 'a+b+x+y'}): - print i |