Merge lp:~sara.ribeiro/gtg/quickadd_tag_parser into lp:~gtg/gtg/old-trunk

[Sara Ribeiro]

Changed the parser in the quick add entry to accept "&" inside a tag

[Izidor Matušov (izidor)]

Can you please extend the test suite in tests/tools/test_tags.py ? ( You might need to merge trunk into your branch first)

review: Needs Fixing

[lp:~sara.ribeiro/gtg/quickadd_tag_parser]

1361. By Sara Ribeiro on 2014-03-13

Solve merge conflict

1362. By Sara Ribeiro on 2014-03-13

Extended test suit

[Sara Ribeiro (sara.ribeiro)]

Ok, I've done that and resubmitted!

=== modified file 'CHANGELOG'
--- CHANGELOG	2014-03-11 03:14:22 +0000
+++ CHANGELOG	2014-03-14 05:36:47 +0000
@@ -22,6 +22,7 @@
     * Fix for bug #1287259 : pep8ify the codebase, by Izidor Matušov
     * Rework of test-suite, by Izidor Matušov
     * Fix for bug #1027604: Deeper integeration of userdoc, by Sara Ribeiro
+    * Fix for bug #1288560 : Parsing error when creating a task (via quick add entry) that contains a tag with "&" in it, by Sara Ribeiro
 
 2013-11-24 Getting Things GNOME! 0.3.1
     * Fix for bug #1024473: Have 'Show Main Window' in notification area, by Antonio Roquentin
 
=== modified file 'GTG/tools/tags.py'
--- GTG/tools/tags.py	2013-11-23 14:40:23 +0000
+++ GTG/tools/tags.py	2014-03-14 05:36:47 +0000
@@ -22,7 +22,7 @@
 
 def extract_tags_from_text(text):
     """ Given a string, returns a list of the @tags contained in that """
-    return re.findall(r'(?:^|[\s])(@[\w\/\.\-\:]*\w)', text)
+    return re.findall(r'(?:^|[\s])(@[\w\/\.\-\:\&]*\w)', text)
 
 
 def parse_tag_list(text):
 
=== modified file 'tests/tools/test_tags.py'
--- tests/tools/test_tags.py	2014-03-10 03:37:32 +0000
+++ tests/tools/test_tags.py	2014-03-14 05:36:47 +0000
@@ -71,6 +71,9 @@
     def ignore_colon_at_end(self):
         self.assertTags("@:a:b:c:", ["@:a:b:c"])
 
+    def test_accepts_ampersand_in_tag(self):
+        self.assertTags("@home&work", ["@home&work"])
+
 
 class TestParseTagList(TestCase):
     """ parse_tag_list """