File size: 19,663 Bytes
5980447 |
1 2 |
{"repo": "terryyin/translate-python", "pull_number": 32, "instance_id": "terryyin__translate-python-32", "issue_numbers": "", "base_commit": "34d149fc8b182a02ca1336d1b3895dda711bcac5", "patch": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -22,6 +22,26 @@\n break\n \n \n+# Save last Version\n+def save_version():\n+ version_path = os.path.join(here, \"translate/version.py\")\n+\n+ with open(version_path) as version_file_read:\n+ content_file = version_file_read.read()\n+\n+ VSRE = r\"^__version__ = ['\\\"]([^'\\\"]*)['\\\"]\"\n+ mo = re.search(VSRE, content_file, re.M)\n+ current_version = mo.group(1)\n+\n+ content_file = content_file.replace(current_version, \"{}\".format(version))\n+\n+ with open(version_path, 'w') as version_file_write:\n+ version_file_write.write(content_file)\n+\n+\n+save_version()\n+\n+\n class VersionCommand(Command):\n description = 'Show library version'\n user_options = []\n@@ -37,12 +57,13 @@ def run(self):\n \n \n # Get the long description\n-with codecs.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:\n- long_description = f.read()\n+with codecs.open(os.path.join(here, 'README.rst')) as f:\n+ long_description = '\\n{}'.format(f.read())\n \n-# Get version\n-with codecs.open(os.path.join(here, 'CHANGES.rst'), encoding='utf-8') as f:\n+# Get change log\n+with codecs.open(os.path.join(here, 'CHANGES.rst')) as f:\n changelog = f.read()\n+ long_description += '\\n\\n{}'.format(changelog)\n \n # Requirements\n with codecs.open(os.path.join(here, 'requirements.txt')) as f:\n@@ -51,32 +72,37 @@ def run(self):\n with codecs.open(os.path.join(here, 'requirements-dev.txt')) as f:\n tests_requirements = [line.replace('\\n', '') for line in f.readlines() if not line == '-r requirements.txt\\n']\n \n+\n setup(\n- name='translate',\n- version=version,\n- description=description,\n- long_description=long_description,\n- url='https://github.com/terryyin/google-translate-python',\n+ author='Terry Yin',\n+ author_email='terry.yinze@gmail.com',\n classifiers=[\n 'Development Status :: 5 - Production/Stable',\n 'Intended Audience :: Education',\n 'Intended Audience :: End Users/Desktop',\n+ 'Intended Audience :: Developers',\n 'License :: OSI Approved :: MIT License',\n- 'Operating System :: POSIX',\n- 'Operating System :: Microsoft :: Windows',\n- 'Operating System :: MacOS :: MacOS X',\n- 'Topic :: Education',\n- 'Programming Language :: Python',\n+ 'Operating System :: OS Independent',\n 'Programming Language :: Python :: 2.6',\n 'Programming Language :: Python :: 2.7',\n- 'Programming Language :: Python :: 3.5'\n+ 'Programming Language :: Python :: 3.5',\n+ 'Programming Language :: Python',\n+ 'Topic :: Education',\n ],\n- author='Terry Yin',\n- author_email='terry.yinze@gmail.com',\n+ cmdclass={'version': VersionCommand},\n+ description=description,\n+ entry_points='''\n+ [console_scripts]\n+ translate-cli=translate.__main__:cli\n+ ''',\n+ install_requires=install_requirements,\n+ keywords='translate translation command line',\n+ license='MIT',\n+ long_description=long_description,\n+ name='translate',\n packages=find_packages(exclude=['docs', 'tests', 'tests.*', 'requirements']),\n setup_requires=['pytest-runner'],\n- install_requires=install_requirements,\n tests_require=tests_requirements,\n- scripts=['translate-cli'],\n- cmdclass={'version': VersionCommand},\n+ url='https://github.com/terryyin/google-translate-python',\n+ version=version,\n )\ndiff --git a/translate/__init__.py b/translate/__init__.py\n--- a/translate/__init__.py\n+++ b/translate/__init__.py\n@@ -2,5 +2,6 @@\n # encoding: utf-8\n \n from .translate import Translator # noqa\n+from .version import __version__ # noqa\n \n-__all__ = ['Translator', ]\n+__all__ = ['Translator', '__version__']\ndiff --git a/translate/main.py b/translate/main.py\n--- a/translate/main.py\n+++ b/translate/main.py\n@@ -1,48 +1,85 @@\n #!/usr/bin/env python\n # encoding: utf-8\n-\n-import argparse\n-import sys\n+import os\n+import click\n+try:\n+ from configparser import ConfigParser\n+except ImportError:\n+ from ConfigParser import ConfigParser\n import locale\n+import sys\n \n from .translate import Translator\n+from .version import __version__\n+\n+\n+TRANSLATION_FROM_DEFAULT = 'autodetect'\n+CONFIG_FILE_PATH = '~/.python-translate.cfg'\n+VERSION_FILE = 'VERSION.txt'\n+\n+here = os.path.dirname(os.path.abspath(__file__))\n+\n+\n+def get_config_info(lang_type):\n+ config_file_path = os.path.expanduser(CONFIG_FILE_PATH)\n+ lang_types = ('from_lang', 'to_lang')\n+ if not os.path.exists(config_file_path) or lang_type not in lang_types:\n+ return ''\n+\n+ config_parser = ConfigParser()\n+ config_parser.read(config_file_path)\n+ default_section = 'DEFAULT'\n+ return config_parser.get(default_section, lang_type)\n+\n+\n+def print_version(ctx, param, value):\n+ if not value or ctx.resilient_parsing:\n+ return\n+\n+ click.echo('translate, version {}'.format(__version__))\n+ ctx.exit()\n+\n+\n+@click.command()\n+@click.option(\n+ '--version', is_flag=True, callback=print_version,\n+ expose_value=False,\n+ is_eager=True,\n+ help='Show the version and exit.'\n+)\n+@click.option(\n+ 'from_lang', '--from', '-f',\n+ default=get_config_info('from_lang') or TRANSLATION_FROM_DEFAULT,\n+ help=\"Language of the text being translated. The default value is 'autodetect'\"\n+)\n+@click.option(\n+ 'to_lang', '--to', '-t',\n+ default=get_config_info('to_lang'),\n+ prompt='Translate to',\n+ help='Language you want translate.'\n+)\n+@click.argument('text', nargs=-1, type=click.STRING, required=True)\n+def main(from_lang, to_lang, text):\n+ \"\"\"\n+ Python command line tool to make on line translations\n+\n+ Example: \\n\n+ \\b\n+ \\t $ translate-cli -t zh the book is on the table\n+ \\t \u7897\u662f\u5728\u684c\u5b50\u4e0a\u3002\n+\n+ Available languages: \\n\n+ \\b\n+ \\t https://en.wikipedia.org/wiki/ISO_639-1\n+ \\t Examples: (e.g. en, ja, ko, pt, zh, zh-TW, ...)\n+ \"\"\"\n+ text = ' '.join(text)\n+ translator = Translator(from_lang=from_lang, to_lang=to_lang)\n \n-TRANSLATION_FROM_DEFAULT = 'en'\n-TRANSLATION_TO_DEFAULT = 'zh'\n-HELPER_LANGUAGES = '(e.g. en, ja, ko, pt, zh, zh-TW, ...)'\n-TRANSLATION_CLIENT = 'translate-cli'\n-MAIN_FILE = '__main__'\n-\n-\n-def main(defvals=None):\n- if not defvals:\n- defvals = {'f': TRANSLATION_FROM_DEFAULT, 't': TRANSLATION_TO_DEFAULT}\n-\n- parser = argparse.ArgumentParser(description=__doc__)\n- parser.add_argument(\n- '-t', '--to', dest='to_lang', type=str, default=defvals['t'],\n- help='To language {}. Default is {}.'.format(HELPER_LANGUAGES, defvals['t'])\n- )\n- parser.add_argument(\n- '-f', '--from', dest='from_lang', type=str, default=defvals['f'],\n- help='From language {}. Default is {}.'.format(HELPER_LANGUAGES, defvals['f'])\n- )\n- parser.add_argument(\n- 'texts', metavar='text', nargs='+',\n- help='a string to translate(use \"\" when it\\'s a sentence)'\n- )\n-\n- if TRANSLATION_CLIENT in sys.argv[0] or MAIN_FILE in sys.argv[0]:\n- sys.argv.pop(0)\n-\n- parsed_args = parser.parse_args(sys.argv)\n-\n- translator = Translator(from_lang=parsed_args.from_lang, to_lang=parsed_args.to_lang)\n- text = ' '.join(parsed_args.texts)\n translation = translator.translate(text)\n if sys.version_info.major == 2:\n translation = translation.encode(locale.getpreferredencoding())\n \n- sys.stdout.write(translation)\n- sys.stdout.write(\"\\n\")\n+ click.echo(translation)\n+\n return translation\ndiff --git a/translate/version.py b/translate/version.py\nnew file mode 100644\n--- /dev/null\n+++ b/translate/version.py\n@@ -0,0 +1 @@\n+__version__ = \"3.3.0\"\n", "test_patch": "diff --git a/tests/conftest.py b/tests/conftest.py\n--- a/tests/conftest.py\n+++ b/tests/conftest.py\n@@ -1,6 +1,12 @@\n #!/usr/bin/env python\n # encoding: utf-8\n import pytest\n+from click.testing import CliRunner\n+\n+\n+@pytest.fixture\n+def cli_runner():\n+ return CliRunner()\n \n \n @pytest.fixture\ndiff --git a/tests/fixtures/cassettes/test_main_language_to_translate_required.yaml b/tests/fixtures/cassettes/test_main_language_to_translate_required.yaml\nnew file mode 100644\n--- /dev/null\n+++ b/tests/fixtures/cassettes/test_main_language_to_translate_required.yaml\n@@ -0,0 +1,46 @@\n+interactions:\n+- request:\n+ body: null\n+ headers:\n+ Accept: ['*/*']\n+ Accept-Encoding: ['gzip, deflate']\n+ Connection: [keep-alive]\n+ User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.19 (KHTML,\n+ like Gecko) Chrome/18.0.1025.168 Safari/535.19']\n+ method: GET\n+ uri: http://api.mymemory.translated.net/get?q=hello+world&langpair=autodetect%7Czh\n+ response:\n+ body: {string: \"\\r\\n{\\\"responseData\\\":{\\\"translatedText\\\":\\\"\\\\u4f60\\\\u597d\\\\uff0c\\\\\\\n+ u4e16\\\\u754c\\\",\\\"match\\\":1,\\\"detectedLanguage\\\":\\\"English\\\"},\\\"quotaFinished\\\"\\\n+ :false,\\\"responseDetails\\\":\\\"\\\",\\\"responseStatus\\\":200,\\\"responderId\\\":\\\"\\\n+ 238\\\",\\\"matches\\\":[{\\\"id\\\":\\\"437872254\\\",\\\"segment\\\":\\\"hello world\\\",\\\"translation\\\"\\\n+ :\\\"\\\\u4f60\\\\u597d\\\\uff0c\\\\u4e16\\\\u754c\\\",\\\"quality\\\":\\\"80\\\",\\\"reference\\\"\\\n+ :null,\\\"usage-count\\\":22,\\\"subject\\\":\\\"All\\\",\\\"created-by\\\":\\\"MateCat\\\",\\\"\\\n+ last-updated-by\\\":\\\"MateCat\\\",\\\"create-date\\\":\\\"2016-09-30 08:10:55\\\",\\\"last-update-date\\\"\\\n+ :\\\"2016-09-30 08:10:55\\\",\\\"match\\\":1},{\\\"id\\\":\\\"433405804\\\",\\\"segment\\\":\\\"\\\n+ hello world.\\\",\\\"translation\\\":\\\"\\\\u4e16\\\\u754c\\\\uff0c\\\\u4f60\\\\u865f\\\\uff01\\\"\\\n+ ,\\\"quality\\\":\\\"74\\\",\\\"reference\\\":null,\\\"usage-count\\\":1,\\\"subject\\\":\\\"All\\\"\\\n+ ,\\\"created-by\\\":\\\"MateCat\\\",\\\"last-updated-by\\\":\\\"MateCat\\\",\\\"create-date\\\"\\\n+ :\\\"2015-07-09 09:14:23\\\",\\\"last-update-date\\\":\\\"2015-07-09 09:14:23\\\",\\\"match\\\"\\\n+ :0.99},{\\\"id\\\":\\\"464325265\\\",\\\"segment\\\":\\\"Hello World\\\",\\\"translation\\\":\\\"\\\n+ Hello World\\\",\\\"quality\\\":\\\"74\\\",\\\"reference\\\":null,\\\"usage-count\\\":20,\\\"\\\n+ subject\\\":\\\"All\\\",\\\"created-by\\\":\\\"MateCat\\\",\\\"last-updated-by\\\":\\\"MateCat\\\"\\\n+ ,\\\"create-date\\\":\\\"2017-10-29 06:37:33\\\",\\\"last-update-date\\\":\\\"2017-10-29\\\n+ \\ 06:37:33\\\",\\\"match\\\":0.98}]}\"}\n+ headers:\n+ Access-Control-Allow-Origin: ['*']\n+ Cache-Control: ['no-cache, no-store, max-age=0, must-revalidate']\n+ Connection: [close]\n+ Content-Length: ['1077']\n+ Content-Type: [application/json; charset=utf-8]\n+ Date: ['Sat, 25 Nov 2017 11:10:54 GMT']\n+ Expires: ['Fri, 01 Jan 1990 00:00:00 GMT']\n+ Pragma: [no-cache]\n+ Server: [Apache/2.4.10 (Debian)]\n+ X-Backend-Content-Length: ['10']\n+ X-Embedded-Status: ['200']\n+ X-Frame-Options: [SAMEORIGIN]\n+ X-Powered-By: [PHP/5.6.30-0+deb8u1]\n+ X-XSS-Protection: ['0']\n+ status: {code: 200, message: OK}\n+version: 1\ndiff --git a/tests/fixtures/cassettes/test_main_to_language.yaml b/tests/fixtures/cassettes/test_main_to_language.yaml\n--- a/tests/fixtures/cassettes/test_main_to_language.yaml\n+++ b/tests/fixtures/cassettes/test_main_to_language.yaml\n@@ -8,37 +8,37 @@ interactions:\n User-Agent: ['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.19 (KHTML,\n like Gecko) Chrome/18.0.1025.168 Safari/535.19']\n method: GET\n- uri: http://api.mymemory.translated.net/get?q=love&langpair=en%7Czh-TW\n+ uri: http://api.mymemory.translated.net/get?q=love&langpair=autodetect%7Czh-TW\n response:\n- body: {string: !!python/unicode \"\\r\\n{\\\"responseData\\\":{\\\"translatedText\\\":\\\"\\\\\\\n- u7231\\\",\\\"match\\\":1},\\\"quotaFinished\\\":false,\\\"responseDetails\\\":\\\"\\\",\\\"responseStatus\\\"\\\n- :200,\\\"responderId\\\":\\\"235\\\",\\\"matches\\\":[{\\\"id\\\":\\\"436719800\\\",\\\"segment\\\"\\\n- :\\\"love\\\",\\\"translation\\\":\\\"\\\\u7231\\\",\\\"quality\\\":\\\"74\\\",\\\"reference\\\":null,\\\"\\\n- usage-count\\\":25,\\\"subject\\\":\\\"All\\\",\\\"created-by\\\":\\\"MateCat\\\",\\\"last-updated-by\\\"\\\n- :\\\"MateCat\\\",\\\"create-date\\\":\\\"2016-06-14 15:28:03\\\",\\\"last-update-date\\\"\\\n- :\\\"2016-06-14 15:28:03\\\",\\\"match\\\":1},{\\\"id\\\":\\\"431321273\\\",\\\"segment\\\":\\\"\\\n- love\\\",\\\"translation\\\":\\\"w ho liau\\\",\\\"quality\\\":\\\"74\\\",\\\"reference\\\":null,\\\"\\\n- usage-count\\\":1,\\\"subject\\\":\\\"General\\\",\\\"created-by\\\":\\\"MateCat\\\",\\\"last-updated-by\\\"\\\n- :\\\"\\\",\\\"create-date\\\":\\\"2014-07-26 17:17:27\\\",\\\"last-update-date\\\":\\\"2014-08-12\\\n- \\ 06:47:10\\\",\\\"match\\\":0.99},{\\\"id\\\":\\\"461350265\\\",\\\"segment\\\":\\\"Love\\\",\\\"\\\n- translation\\\":\\\"\\\\u7231\\\\u610f\\\",\\\"quality\\\":\\\"74\\\",\\\"reference\\\":null,\\\"\\\n- usage-count\\\":1,\\\"subject\\\":\\\"All\\\",\\\"created-by\\\":\\\"MateCat\\\",\\\"last-updated-by\\\"\\\n- :\\\"MateCat\\\",\\\"create-date\\\":\\\"2017-06-22 11:34:29\\\",\\\"last-update-date\\\"\\\n- :\\\"2017-06-22 11:34:29\\\",\\\"match\\\":0.98}]}\"}\n+ body: {string: \"\\r\\n{\\\"responseData\\\":{\\\"translatedText\\\":\\\"\\\\u7231\\\",\\\"match\\\"\\\n+ :1,\\\"detectedLanguage\\\":\\\"English\\\"},\\\"quotaFinished\\\":false,\\\"responseDetails\\\"\\\n+ :\\\"\\\",\\\"responseStatus\\\":200,\\\"responderId\\\":\\\"235\\\",\\\"matches\\\":[{\\\"id\\\"\\\n+ :\\\"436719800\\\",\\\"segment\\\":\\\"love\\\",\\\"translation\\\":\\\"\\\\u7231\\\",\\\"quality\\\"\\\n+ :\\\"74\\\",\\\"reference\\\":null,\\\"usage-count\\\":25,\\\"subject\\\":\\\"All\\\",\\\"created-by\\\"\\\n+ :\\\"MateCat\\\",\\\"last-updated-by\\\":\\\"MateCat\\\",\\\"create-date\\\":\\\"2016-06-14\\\n+ \\ 15:28:03\\\",\\\"last-update-date\\\":\\\"2016-06-14 15:28:03\\\",\\\"match\\\":1},{\\\"\\\n+ id\\\":\\\"431321273\\\",\\\"segment\\\":\\\"love\\\",\\\"translation\\\":\\\"w ho liau\\\",\\\"quality\\\"\\\n+ :\\\"74\\\",\\\"reference\\\":null,\\\"usage-count\\\":1,\\\"subject\\\":\\\"General\\\",\\\"created-by\\\"\\\n+ :\\\"MateCat\\\",\\\"last-updated-by\\\":\\\"\\\",\\\"create-date\\\":\\\"2014-07-26 17:17:27\\\"\\\n+ ,\\\"last-update-date\\\":\\\"2014-08-12 06:47:10\\\",\\\"match\\\":0.99},{\\\"id\\\":\\\"464574969\\\"\\\n+ ,\\\"segment\\\":\\\"Love\\\",\\\"translation\\\":\\\"\\\\u559c\\\\u6b22\\\",\\\"quality\\\":\\\"74\\\"\\\n+ ,\\\"reference\\\":null,\\\"usage-count\\\":9,\\\"subject\\\":\\\"All\\\",\\\"created-by\\\":\\\"\\\n+ MateCat\\\",\\\"last-updated-by\\\":\\\"MateCat\\\",\\\"create-date\\\":\\\"2017-11-25 11:44:15\\\"\\\n+ ,\\\"last-update-date\\\":\\\"2017-11-25 11:44:15\\\",\\\"match\\\":0.98}]}\"}\n headers:\n- access-control-allow-origin: ['*']\n- cache-control: ['no-cache, no-store, max-age=0, must-revalidate']\n- connection: [close]\n- content-length: ['948']\n- content-type: [application/json; charset=utf-8]\n- date: ['Mon, 13 Nov 2017 13:32:31 GMT']\n- expires: ['Fri, 01 Jan 1990 00:00:00 GMT']\n- pragma: [no-cache]\n- server: [Apache/2.4.10 (Debian)]\n- x-backend-content-length: ['10']\n- x-embedded-status: ['200']\n- x-frame-options: [SAMEORIGIN]\n- x-powered-by: [PHP/5.6.30-0+deb8u1]\n- x-xss-protection: ['0']\n+ Access-Control-Allow-Origin: ['*']\n+ Cache-Control: ['no-cache, no-store, max-age=0, must-revalidate']\n+ Connection: [close]\n+ Content-Length: ['977']\n+ Content-Type: [application/json; charset=utf-8]\n+ Date: ['Sat, 25 Nov 2017 11:11:51 GMT']\n+ Expires: ['Fri, 01 Jan 1990 00:00:00 GMT']\n+ Pragma: [no-cache]\n+ Server: [Apache/2.4.10 (Debian)]\n+ X-Backend-Content-Length: ['10']\n+ X-Embedded-Status: ['200']\n+ X-Frame-Options: [SAMEORIGIN]\n+ X-Powered-By: [PHP/5.6.30-0+deb8u1]\n+ X-XSS-Protection: ['0']\n status: {code: 200, message: OK}\n version: 1\ndiff --git a/tests/test_cli.py b/tests/test_cli.py\ndeleted file mode 100644\n--- a/tests/test_cli.py\n+++ /dev/null\n@@ -1,19 +0,0 @@\n-#!/usr/bin/env python\n-# encoding: utf-8\n-from __future__ import unicode_literals\n-import subprocess\n-try:\n- from unittest import mock\n-except Exception:\n- import mock\n-\n-\n-def test_command_line_complete():\n- # This test is impossible mock direct because is a subprocess\n- expected = u'\u7897\u662f\u5728\u684c\u5b50\u4e0a\u3002'\n- subprocess.check_output = mock.create_autospec(subprocess.check_output, return_value=expected)\n- result = subprocess.check_output(\n- [\"./translate-cli\", '--from', 'en', '--to', 'zh-TW',\n- \"The\", \"book\", \"is\", \"on\", \"the\", \"table.\"]\n- )\n- assert expected == result\ndiff --git a/tests/test_main.py b/tests/test_main.py\n--- a/tests/test_main.py\n+++ b/tests/test_main.py\n@@ -1,6 +1,6 @@\n #!/usr/bin/env python\n # encoding: utf-8\n-import sys\n+from __future__ import unicode_literals\n \n from translate.main import main\n \n@@ -8,21 +8,18 @@\n \n \n @vcr.use_cassette\n-def test_main_take_zh_as_default_language():\n- sys.argv = ['hello', 'world']\n- result = main()\n- assert '\u4f60\u597d\uff0c\u4e16\u754c' == result\n+def test_main_language_to_translate_required(cli_runner):\n+ result = cli_runner.invoke(main, ['hello', 'world'], input='zh')\n+ assert 'Translate to []: zh\\n\u4f60\u597d\uff0c\u4e16\u754c\\n' == result.output\n \n \n @vcr.use_cassette\n-def test_main_to_language():\n- sys.argv = ['-t', 'zh-TW', 'love']\n- result = main()\n- assert '\u7231' == result\n+def test_main_to_language(cli_runner):\n+ result = cli_runner.invoke(main, ['-t', 'zh-TW', 'love'])\n+ assert '\u7231\\n' == result.output\n \n \n @vcr.use_cassette\n-def test_main_from_language():\n- sys.argv = ['--from', 'ja', '\u7f8e']\n- result = main()\n- assert '\u7f8e' == result\n+def test_main_from_language(cli_runner):\n+ result = cli_runner.invoke(main, ['--from', 'ja', '--to', 'zh', '\u7f8e'])\n+ assert '\u7f8e\\n' == result.output\ndiff --git a/tests/vcr_conf.py b/tests/vcr_conf.py\n--- a/tests/vcr_conf.py\n+++ b/tests/vcr_conf.py\n@@ -1,9 +1,4 @@\n #!/usr/bin/env python\n-# ----------------------------------------------------------------------------\n-# \"THE BEER-WARE LICENSE\" (Revision 42):\n-# <terry.yinzhe@gmail.com> wrote this file. As long as you retain this notice you\n-# can do whatever you want with this stuff. If we meet some day, and you think\n-# this stuff is worth it, you can buy me a beer in return to Terry Yin.\n import os\n \n from vcr import VCR\n", "problem_statement": "", "hints_text": "", "created_at": "2017-11-25T00:05:54Z"}
|