Merge branch 'EpicJhon-dev' into dev

Author: sloria

AUTHORS.rst

@@ -22,3 +22,4 @@ Contributors (chronological)
 - Jonathon Coe `@jonmcoe <https://github.com/jonmcoe>`_
 - Adrián López Calvo `@AdrianLC <https://github.com/AdrianLC>`_
 - Nitish Kulshrestha `@nitkul <https://github.com/nitkul>`_
+- Jhon Eslava `@EpicJhon <https://github.com/EpicJhon>`_

tests/test_translate.py

@@ -38,13 +38,13 @@ def test_failed_translation_raises_not_translated(self, mock_request):
         assert_equal(mock_request.call_count, len(failed_responses))
 
     @mock.patch("textblob.translate.Translator._request")
-    def test_tk_parameter_included_in_requests(self, mock_request):
+    def test_tk_parameter_included_in_request_url(self, mock_request):
         mock_request.return_value = '["Esta es una frase.","en"]'
         self.translator.translate(self.sentence, to_lang="es")
         assert_true(mock_request.called_once)
         args, kwargs = mock_request.call_args
-        tk = kwargs['data']['tk']
-        assert_true(re.match(r'^\d+\.\d+$', tk))
+        url = args[0]
+        assert_true(re.match('.+&tk=\d+\.\d+$', url))
 
     @mock.patch('textblob.translate.Translator._request')
     def test_detect(self, mock_request):
@@ -84,7 +84,7 @@ def test_translate_spaces(self):
         assert_equal(to_en, "Hello, my name is Adrian! How are you? I am good")
 
     def test_translate_missing_from_language_auto_detects(self):
-        text = "Ich besorge das Bier"
+        text = "Ich hole das Bier"
         translated = self.translator.translate(text, to_lang="en")
         assert_equal(translated, "I'll get the beer")
 
@@ -94,16 +94,16 @@ def test_translate_text(self):
         assert_equal(translated, "Esta es una frase.")
         es_text = "Esta es una frase."
         to_en = self.translator.translate(es_text, from_lang="es", to_lang="en")
-        assert_equal(to_en, "This is a sentence.")
+        assert_equal(to_en, "This is a phrase.")
 
     def test_translate_non_ascii(self):
         text = "ذات سيادة كاملة"
         translated = self.translator.translate(text, from_lang='ar', to_lang='en')
         assert_equal(translated, "With full sovereignty")
 
-        text2 = "美丽优于丑陋"
+        text2 = "美丽比丑陋更好"
         translated = self.translator.translate(text2, from_lang="zh-CN", to_lang='en')
-        assert_equal(translated, "Beautiful is better than ugly")
+        assert_equal(translated, "Beauty is better than ugly")
 
     @mock.patch('textblob.translate.Translator._validate_translation', mock.MagicMock())
     def test_translate_unicode_escape(self):

textblob/translate.py

@@ -11,7 +11,6 @@
 import ctypes
 import json
 import re
-import time
 
 from textblob.compat import PY2, request, urlencode
 from textblob.exceptions import TranslatorError, NotTranslated
@@ -31,7 +30,7 @@ class Translator(object):
         u'es'
     """
 
-    url = "http://translate.google.com/translate_a/t"
+    url = "http://translate.google.com/translate_a/t?client=webapp&dt=bd&dt=ex&dt=ld&dt=md&dt=qca&dt=rw&dt=rm&dt=ss&dt=t&dt=at&ie=UTF-8&oe=UTF-8&otf=2&ssel=0&tsel=0&kc=1"
 
     headers = {
         'Accept': '*/*',
@@ -45,11 +44,14 @@ def translate(self, source, from_lang='auto', to_lang='en', host=None, type_=Non
         """Translate the source text from one language to another."""
         if PY2:
             source = source.encode('utf-8')
-        data = {"client": "p",
-                "ie": "UTF-8", "oe": "UTF-8",
-                "dt": "at", "tk": _calculate_tk(source),
-                "sl": from_lang, "tl": to_lang, "text": source}
-        response = self._request(self.url, host=host, type_=type_, data=data)
+        data = {"q": source}
+        url = u'{url}&sl={from_lang}&tl={to_lang}&hl={to_lang}&tk={tk}'.format(
+            url=self.url,
+            from_lang=from_lang,
+            to_lang=to_lang,
+            tk=_calculate_tk(source),
+        )
+        response = self._request(url, host=host, type_=type_, data=data)
         result = json.loads(response)
         if isinstance(result, list):
             try:
@@ -65,11 +67,9 @@ def detect(self, source, host=None, type_=None):
             source = source.encode('utf-8')
         if len(source) < 3:
             raise TranslatorError('Must provide a string with at least 3 characters.')
-        data = {"client": "p",
-                "ie": "UTF-8", "oe": "UTF-8",
-                "dt": "at", "tk": _calculate_tk(source),
-                "sl": "auto", "text": source}
-        response = self._request(self.url, host=host, type_=type_, data=data)
+        data = {"q": source}
+        url = u'{url}&sl=auto&tk={tk}'.format(url=self.url, tk=_calculate_tk(source))
+        response = self._request(url, host=host, type_=type_, data=data)
         result, language = json.loads(response)
         return language
 
@@ -105,7 +105,10 @@ def _unescape(text):
 def _calculate_tk(source):
     """Reverse engineered cross-site request protection."""
     # Source: https://github.com/soimort/translate-shell/issues/94#issuecomment-165433715
-    b = int(time.time() / 3600)
+    # Source: http://www.liuxiatool.com/t.php
+
+    tkk = [406398, 561666268 + 1526272306]
+    b = tkk[0]
 
     if PY2:
         d = map(ord, source)
@@ -114,17 +117,20 @@ def _calculate_tk(source):
 
     def RL(a, b):
         for c in range(0, len(b) - 2, 3):
-            d = b[c+2]
+            d = b[c + 2]
             d = ord(d) - 87 if d >= 'a' else int(d)
             xa = ctypes.c_uint32(a).value
-            d = xa >> d if b[c+1] == '+' else xa << d
+            d = xa >> d if b[c + 1] == '+' else xa << d
             a = a + d & 4294967295 if b[c] == '+' else a ^ d
         return ctypes.c_int32(a).value
 
     a = b
+
     for di in d:
         a = RL(a + di, "+-a^+6")
+
     a = RL(a, "+-3^+b+-f")
+    a ^= tkk[1]
     a = a if a >= 0 else ((a & 2147483647) + 2147483648)
     a %= pow(10, 6)