Merge lp:~dobey/intltool/python-strings into lp:intltool

[dobey]

Handle multi-line python strings ''' and """ better

=== modified file 'intltool-update.in'
--- intltool-update.in	2009-04-21 01:58:31 +0000
+++ intltool-update.in	2009-07-12 19:12:22 +0000
@@ -425,6 +425,7 @@
     {
 	my $in_comment = 0;
 	my $in_macro = 0;
+        my $in_string = 0;
 
 	open FILE, "<$file";
 	while (<FILE>)
@@ -436,6 +437,13 @@
 		$in_comment = 0;
 	    }
 
+            # Handle continued multi-line string.
+            if ($in_string)
+            {
+                next unless /(\'\'\'|\"\"\")/;
+                $in_string = 0;
+            }
+
 	    # Handle continued macro.
 	    if ($in_macro)
 	    {
@@ -451,7 +459,7 @@
 	    }
 
 	    # Handle comments and quoted text.
-	    while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
+	    while (m-(/\*|//|\'\'\'|\"\"\"|\'|\")-) # \' and \" keep emacs perl mode happy
 	    {
 		my $match = $1;
 		if ($match eq "/*")
@@ -466,6 +474,14 @@
 		{
 		    s-//.*--;
 		}
+                elsif ($match eq "\"\"\"" or $match eq "\'\'\'")
+                {
+                    if (!s-$match.*?$match--)
+                    {
+                        s-$match.*--;
+                        $in_string = 1;
+                    }
+                }
 		else # ' or "
 		{
 		    if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)