← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/win32utils.py

merge bzr.dev 4807, resolve test conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/win32utils.py
535
535
        self._input_iter = iter(self._input)
536
536
        self._whitespace_match = re.compile(u'\s').match
537
537
        self._word_match = re.compile(u'\S').match
538
 
        self._quote_chars = u'\'"'
 
538
        self._quote_chars = u'"'
539
539
        # self._quote_match = re.compile(u'[\'"]').match
540
540
        self._escape_match = lambda x: None # Never matches
541
541
        self._escape = '\\'
543
543
        #   ' ' - after whitespace, starting a new token
544
544
        #   'a' - after text, currently working on a token
545
545
        #   '"' - after ", currently in a "-delimited quoted section
546
 
        #   "'" - after ', currently in a '-delimited quotod section
547
546
        #   "\" - after '\', checking the next char
548
547
        self._state = ' '
549
548
        self._token = [] # Current token being parsed