update googletrans to version 2.2.0

qiushi9 · Dec 25, 2017 · b787337 · b787337
1 parent 56144d5
commit b787337
Show file tree

Hide file tree

Showing 16 changed files with 14 additions and 3 deletions.
diff --git a/src/googletrans/__init__.py b/src/googletrans/__init__.py
@@ -1,6 +1,6 @@
 """Free Google Translate API for Python. Translates totally free of charge."""
 __all__ = 'Translator',
-__version__ = '2.1.4'
+__version__ = '2.2.0'
 
 
 from googletrans.client import Translator

diff --git a/src/googletrans/__init__.pyc b/src/googletrans/__init__.pyc
diff --git a/src/googletrans/client.py b/src/googletrans/client.py
diff --git a/src/googletrans/client.pyc b/src/googletrans/client.pyc
diff --git a/src/googletrans/compat.py b/src/googletrans/compat.py
diff --git a/src/googletrans/compat.pyc b/src/googletrans/compat.pyc
diff --git a/src/googletrans/constants.py b/src/googletrans/constants.py
diff --git a/src/googletrans/constants.pyc b/src/googletrans/constants.pyc
diff --git a/src/googletrans/gtoken.py b/src/googletrans/gtoken.py
@@ -162,7 +162,7 @@ def acquire(self, text):
                         e.append(l >> 12 & 63 | 128)
                     else:
                         e.append(l >> 12 | 224)
-                        e.append(l >> 6 & 63 | 128)
+                    e.append(l >> 6 & 63 | 128)
                 e.append(l & 63 | 128)
         a = b
         for i, value in enumerate(e):

diff --git a/src/googletrans/gtoken.pyc b/src/googletrans/gtoken.pyc
diff --git a/src/googletrans/models.py b/src/googletrans/models.py
diff --git a/src/googletrans/models.pyc b/src/googletrans/models.pyc
diff --git a/src/googletrans/urls.py b/src/googletrans/urls.py
diff --git a/src/googletrans/urls.pyc b/src/googletrans/urls.pyc
diff --git a/src/googletrans/utils.py b/src/googletrans/utils.py
@@ -22,11 +22,14 @@ def build_params(query, src, dest, token):
     return params
 
 
-def format_json(original):
+def legacy_format_json(original):
     # save state
     states = []
     text = original
+
+    # save position for double-quoted texts
     for i, pos in enumerate(re.finditer('"', text)):
+        # pos.start() is a double-quote
         p = pos.start() + 1
         if i % 2 == 0:
             nxt = text.find('"', p)
@@ -52,6 +55,14 @@ def format_json(original):
     return converted
 
 
+def format_json(original):
+    try:
+        converted = json.loads(original)
+    except ValueError:
+        converted = legacy_format_json(original)
+    return converted
+
+
 def rshift(val, n):
     """python port for '>>>'(right shift with padding)
     """

diff --git a/src/googletrans/utils.pyc b/src/googletrans/utils.pyc