Merge branch 'master' into bugfix/branch-mangler

2013-04-04 21:52:45 -04:00 · 2013-04-04 21:52:45 -04:00 · 7da1129298
commit 7da1129298
parent 7c9fa3758c 9578ae7a57
1 changed files with 3 additions and 0 deletions
--- a/hy/lex/states.py
+++ b/hy/lex/states.py
@ -236,6 +236,9 @@ class String(State):
            if char == "\\":
                self.nodes.append("\\")
                return
+            if char == "\"":
+                self.nodes.append("\"")
+                return

            raise LexException("Unknown modifier: `%s'" % (char))