From 0a032a760d0c784aaf0e7ca0593dfeaf6cb0f577 Mon Sep 17 00:00:00 2001
From: Marc Abramowitz <marc@marc-abramowitz.com>
Date: Thu, 3 Apr 2014 15:45:55 -0700
Subject: Allow backslashing curly braces to prevent expansion

e.g.: commands=echo \{posargs\} = {posargs}

--HG--
branch : allow_backslash_escape_curly_braces_msabramo_2
---
 tox/_config.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tox')

diff --git a/tox/_config.py b/tox/_config.py
index 6006fa94..4d54924b 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -451,8 +451,8 @@ class IndexServerConfig:
         self.url = url
 
 RE_ITEM_REF = re.compile(
-    '''
-    [{]
+    r'''
+    (?<!\\)[{]
     (?:(?P<sub_type>[^[:{}]+):)?    # optional sub_type for special rules
     (?P<substitution_value>[^{}]*)  # substitution key
     [}]
@@ -686,7 +686,7 @@ class CommandParser(object):
         def word_has_ended():
             return ((cur_char in string.whitespace and ps.word and
                ps.word[-1] not in string.whitespace) or
-              (cur_char == '{' and ps.depth == 0) or
+              (cur_char == '{' and ps.depth == 0 and not ps.word.endswith('\\')) or
               (ps.depth == 0 and ps.word and ps.word[-1] == '}') or
               (cur_char not in string.whitespace and ps.word and
                ps.word.strip() == ''))
-- 
cgit v1.2.1