diff options
| author | Takayuki Shimizukawa <shimizukawa+bitbucket@gmail.com> | 2012-11-30 12:46:52 +0900 |
|---|---|---|
| committer | Takayuki Shimizukawa <shimizukawa+bitbucket@gmail.com> | 2012-11-30 12:46:52 +0900 |
| commit | b2c7e4db172fbe08f2998fa9f477a3d16486caa9 (patch) | |
| tree | 31a873a3409ac31e46c55e15fb84349cfce8fce4 | |
| parent | c1d576f049353ff98e13aa0a8fc91a5a6ff83446 (diff) | |
| parent | e31620fb477769a2fc01b49d1d94b3cce25c8d36 (diff) | |
| download | sphinx-b2c7e4db172fbe08f2998fa9f477a3d16486caa9.tar.gz | |
Merged in shimizukawa/sphinx-fix-fork/#1041 (pull request #87)
| -rw-r--r-- | sphinx/domains/cpp.py | 2 | ||||
| -rw-r--r-- | sphinx/quickstart.py | 2 | ||||
| -rw-r--r-- | tests/test_cpp_domain.py | 3 | ||||
| -rw-r--r-- | tests/test_quickstart.py | 19 |
4 files changed, 24 insertions, 2 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index edbc091e..e4204aab 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -854,7 +854,7 @@ class DefinitionParser(object): visibility = 'public' if self.match(_visibility_re): visibility = self.matched_text - static = self.skip_word('static') + static = self.skip_word_and_ws('static') return visibility, static def parse_type(self): diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index 2bba4459..64c2e23c 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -824,7 +824,7 @@ def do_prompt(d, key, text, default=None, validator=nonempty): prompt = purple(PROMPT_PREFIX + '%s [%s]: ' % (text, default)) else: prompt = purple(PROMPT_PREFIX + text + ': ') - x = term_input(prompt) + x = term_input(prompt).strip() if default and not x: x = default if not isinstance(x, unicode): diff --git a/tests/test_cpp_domain.py b/tests/test_cpp_domain.py index 64a52aa9..c8466e37 100644 --- a/tests/test_cpp_domain.py +++ b/tests/test_cpp_domain.py @@ -69,6 +69,9 @@ def test_type_definitions(): x = 'constexpr int get_value()' assert unicode(parse('function', x)) == x + x = 'static constexpr int get_value()' + assert unicode(parse('function', x)) == x + x = 'int get_value() const noexcept' assert unicode(parse('function', x)) == x diff --git a/tests/test_quickstart.py b/tests/test_quickstart.py index dba888dd..c054f858 100644 --- a/tests/test_quickstart.py +++ b/tests/test_quickstart.py @@ -46,6 +46,25 @@ def teardown_module(): coloron() +def test_quickstart_inputstrip(): + d = {} + answers = { + 'Q1': 'Y\r', # input() return with '\r' on Python-3.2.0 for Windows + 'Q2': ' Yes \r', + 'Q3': 'N', + 'Q4': 'N ', + } + qs.term_input = mock_raw_input(answers) + qs.do_prompt(d, 'k1', 'Q1') + assert d['k1'] == 'Y' + qs.do_prompt(d, 'k2', 'Q2') + assert d['k2'] == 'Yes' + qs.do_prompt(d, 'k3', 'Q3') + assert d['k3'] == 'N' + qs.do_prompt(d, 'k4', 'Q4') + assert d['k4'] == 'N' + + def test_do_prompt(): d = {} answers = { |