Add fixes for Python3 and fix counter in Python2

Author: dmsnell

python2/diff_match_patch.py

@@ -1179,9 +1179,9 @@ def diff_toDelta(self, diffs):
         data = data.encode("utf-8")
         text.append("+" + urllib.quote(data, "!~*'();/?:@&=+$,# "))
       elif op == self.DIFF_DELETE:
-        text.append("-%d" % len(data))
+        text.append("-%d" % (len(data.encode('utf-16be')) // 2))
       elif op == self.DIFF_EQUAL:
-        text.append("=%d" % len(data))
+        text.append("=%d" % (len(data.encode('utf-16be')) // 2))
     return "\t".join(text)
 
   def diff_fromDelta(self, text1, delta):

python3/diff_match_patch.py

@@ -1176,9 +1176,9 @@ def diff_toDelta(self, diffs):
         data = data.encode("utf-8")
         text.append("+" + urllib.parse.quote(data, "!~*'();/?:@&=+$,# "))
       elif op == self.DIFF_DELETE:
-        text.append("-%d" % len(data))
+        text.append("-%d" % (len(data.encode('utf-16-be')) // 2))
       elif op == self.DIFF_EQUAL:
-        text.append("=%d" % len(data))
+        text.append("=%d" % (len(data.encode('utf-16-be')) // 2))
     return "\t".join(text)
 
   def diff_fromDelta(self, text1, delta):

python3/tests/diff_match_patch_test.py

@@ -447,7 +447,7 @@ def testDiffDelta(self):
 
     diffs = [(self.dmp.DIFF_EQUAL, "\ud83d\ude4b\ud83d"), (self.dmp.DIFF_INSERT, "\ude4c\ud83d"), (self.dmp.DIFF_EQUAL, "\ude4b")]
     delta = self.dmp.diff_toDelta(diffs)
-    self.assertEquals("=2\t+%F0%9F%99%8C\t=2", delta)
+    self.assertEqual("=2\t+%F0%9F%99%8C\t=2", delta)
 
     # Verify pool of unchanged characters.
     diffs = [(self.dmp.DIFF_INSERT, "A-Z a-z 0-9 - _ . ! ~ * ' ( ) ; / ? : @ & = + $ , # ")]