From 5f483cc2358056b3ad756b0da02dbe636543c0bd Mon Sep 17 00:00:00 2001
From: Ben Kurtovic <ben.kurtovic@gmail.com>
Date: Thu, 19 Jun 2014 00:19:28 -0400
Subject: [PATCH] Add some unit tests; fix #74.

---
 app.py                     |  5 ++---
 bitshift/query/__init__.py |  5 +----
 test/test_query_parser.py  | 23 ++++++++++++++++-------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app.py b/app.py
index 8192c07..36add14 100644
--- a/app.py
+++ b/app.py
@@ -2,11 +2,10 @@
 Module to contain all the project's Flask server plumbing.
 """
 
-import datetime
-import flask
-
 from json import dumps
+
 from flask import Flask, make_response, render_template, request
+
 from bitshift import assets
 from bitshift.database import Database
 from bitshift.languages import LANGS
diff --git a/bitshift/query/__init__.py b/bitshift/query/__init__.py
index 3f59c87..4e91c77 100644
--- a/bitshift/query/__init__.py
+++ b/bitshift/query/__init__.py
@@ -217,10 +217,7 @@ class _QueryParser(object):
 
     def _parse_term(self, term):
         """Parse a query term into a tree node and return it."""
-        try:
-            term = term.decode("unicode_escape")
-        except UnicodeDecodeError:
-            raise QueryParseException('Invalid query term: "%s"' % term)
+        term = term.replace('\\"', '"').replace("\\\\", "\\")
         if ":" in term and not term[0] == ":":
             prefix, arg = term.split(":", 1)
             invert = prefix.lower() == "not"
diff --git a/test/test_query_parser.py b/test/test_query_parser.py
index 24941c0..7156a6f 100644
--- a/test/test_query_parser.py
+++ b/test/test_query_parser.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8  -*-
+
 from __future__ import unicode_literals
 import unittest
 
@@ -12,7 +14,8 @@ TESTS = [
     ("language:python", "Tree(Language(Python))"),
     ("language:py", "Tree(Language(Python))"),
     ("l:r:r..y", "Tree(Language(Ruby))"),
-    ("lang:re:py|c", "Tree(BinaryOp(Language(C), OR, Language(Python)))"),
+    (r'"lang:re:python|^c$"',
+     "Tree(BinaryOp(Language(C), OR, Language(Python)))"),
 
     # Author
     ('"author:Ben Kurtovic"', "Tree(Author(String(u'Ben Kurtovic')))"),
@@ -25,12 +28,12 @@ TESTS = [
      "Tree(Date(MODIFY, AFTER, 2010-05-09 10:11:12))"),
 
     # Symbol
-    ("sym:foobar", "Tree(Symbol(ALL, String(u'foobar')))"),
-    ("func:foo_bar", "Tree(Symbol(FUNCTION, String(u'foo_bar')))"),
-    ("func:foo_bar()", "Tree(Symbol(FUNCTION, String(u'foo_bar')))"),
-    ("class:FooBar", "Tree(Symbol(CLASS, String(u'FooBar')))"),
-    ("var:foobar", "Tree(Symbol(VARIABLE, String(u'foobar')))"),
-    ("var:r:foobar", "Tree(Symbol(VARIABLE, Regex(u'foobar')))"),
+    ("sym:foobar", "Tree(Symbol(ALL, ALL, String(u'foobar')))"),
+    ("func:foo_bar", "Tree(Symbol(ALL, FUNCTION, String(u'foo_bar')))"),
+    ("func:foo_bar()", "Tree(Symbol(ALL, FUNCTION, String(u'foo_bar')))"),
+    ("class:FooBar", "Tree(Symbol(ALL, CLASS, String(u'FooBar')))"),
+    ("var:foobar", "Tree(Symbol(ALL, VARIABLE, String(u'foobar')))"),
+    ("var:r:foobar", "Tree(Symbol(ALL, VARIABLE, Regex(u'foobar')))"),
 
     # Composition
     ("(a and b) or (c and d)", ", ".join([
@@ -52,6 +55,12 @@ TESTS = [
     ("a not b", ", ".join([
         "Tree(BinaryOp(Text(String(u'a'))", "AND", "UnaryOp(NOT",
         "Text(String(u'b')))))"])),
+
+    # Unicode, Escaping
+    (r'lang:py "author:fo\\o \"bar\" baz\\"', ", ".join([
+        "Tree(BinaryOp(Language(Python)", "AND",
+        "Author(String(u'fo\\\\o \"bar\" baz\\\\'))))"])),
+    ('"author:Ben Kurtović"', "Tree(Author(String(u'Ben Kurtovi\\u0107')))")
 ]
 
 class TestQueryParser(unittest.TestCase):