Skip to content

Commit

Permalink
Merge 7b2a1c3 into 4aebfb1
Browse files Browse the repository at this point in the history
  • Loading branch information
Eugene Uvarov committed Apr 14, 2019
2 parents 4aebfb1 + 7b2a1c3 commit 723f6d4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
12 changes: 9 additions & 3 deletions googletrans/client.py
Expand Up @@ -38,21 +38,27 @@ class Translator(object):
:param timeout: Definition of timeout for Requests library.
Will be used by every request.
:type timeout: number or a double of numbers
:param verify: Cerfiticate path for SSL-enabled proxies.
:type verify: :class:`str`
"""

def __init__(self, service_urls=None, user_agent=DEFAULT_USER_AGENT,
proxies=None, timeout=None):
proxies=None, timeout=None, verify=None):

self.session = requests.Session()
if proxies is not None:
if proxies:
self.session.proxies = proxies
self.session.headers.update({
'User-Agent': user_agent,
})
if timeout is not None:
if timeout:
self.session.mount('https://', TimeoutAdapter(timeout))
self.session.mount('http://', TimeoutAdapter(timeout))

if verify:
self.session.verify = verify

self.service_urls = service_urls or ['translate.google.com']
self.token_acquirer = TokenAcquirer(session=self.session, host=self.service_urls[0])

Expand Down
5 changes: 3 additions & 2 deletions test-requirements.txt
@@ -1,3 +1,4 @@
requests==2.13.0
future==0.14.3
coveralls==1.1
future==0.14.3
requests==2.13.0
pytest==4.4.0
4 changes: 2 additions & 2 deletions tests/test_client.py
Expand Up @@ -87,11 +87,11 @@ def test_detect_list(translator):


def test_src_in_special_cases(translator):
args = ('Tere', 'en', 'ee')
args = ('Kala', 'en', 'ee')

result = translator.translate(*args)

assert result.text == 'Hello'
assert result.text == 'Fish'


def test_src_not_in_supported_languages(translator):
Expand Down

0 comments on commit 723f6d4

Please sign in to comment.