Merge branch 'release/0.1.12'

.travis.yml

@@ -28,4 +28,4 @@ script:
   - coverage report --include="*m2r.py,*m2r/tests*"
   - cp -f .coverage ../
 after_success:
-  - if [[ $TRAVIS_PYTHON_VERSION == 3.6* ]]; then codecov && coveralls; fi
+  - if [[ $TRAVIS_PYTHON_VERSION == 3.6* ]]; then codecov -b $TRAVIS_BRANCH && coveralls; fi

CHANGES.md

@@ -2,6 +2,10 @@
 
 (next version)
 
+### Version 0.1.12 (2017-09-11)
+
+* Support multi byte characters for heading
+
 ### Version 0.1.11 (2017-08-30)
 
 * Add metadata for sphinx

docs/conf.py

@@ -66,9 +66,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.11'
+version = '0.1.12'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.11'
+release = '0.1.12'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -143,7 +143,7 @@
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = 'M2R v0.1.11'
+#html_title = 'M2R v0.1.12'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
 #html_short_title = None

m2r.py

@@ -4,15 +4,21 @@
 from __future__ import print_function, unicode_literals
 import os
 import re
+import sys
 from argparse import ArgumentParser, Namespace
 
 from docutils import statemachine, nodes, io, utils
 from docutils.parsers import rst
 from docutils.core import ErrorString
-from docutils.utils import SafeString
+from docutils.utils import SafeString, column_width
 import mistune
 
-__version__ = '0.1.11'
+if sys.version_info < (3, ):
+    from codecs import open as _open
+else:
+    _open = open
+
+__version__ = '0.1.12'
 _is_sphinx = False
 prolog = '''\
 .. role:: raw-html-m2r(raw)
@@ -214,7 +220,8 @@ def header(self, text, level, raw=None):
         :param level: a number for the header level, for example: 1.
         :param raw: raw text content of the header.
         """
-        return '\n{0}\n{1}\n'.format(text, self.hmarks[level] * len(text))
+        return '\n{0}\n{1}\n'.format(text,
+                                     self.hmarks[level] * column_width(text))
 
     def hrule(self):
         """Rendering method for ``<hr>`` tag."""
@@ -552,24 +559,24 @@ def convert(text, **kwargs):
     return M2R(**kwargs)(text)
 
 
-def parse_from_file(file, **kwargs):
+def parse_from_file(file, encoding='utf-8', **kwargs):
     if not os.path.exists(file):
         raise OSError('No such file exists: {}'.format(file))
-    with open(file) as f:
+    with _open(file, encoding=encoding) as f:
         src = f.read()
     output = convert(src, **kwargs)
     return output
 
 
-def save_to_file(file, src):
+def save_to_file(file, src, encoding='utf-8', **kwargs):
     target = os.path.splitext(file)[0] + '.rst'
     if not options.overwrite and os.path.exists(target):
         confirm = input('{} already exists. overwrite it? [y/n]: '.format(
             target))
         if confirm.upper() not in ('Y', 'YES'):
             print('skip {}'.format(file))
             return
-    with open(target, 'w') as f:
+    with _open(target, 'w', encoding=encoding) as f:
         f.write(src)
 
 

setup.py

@@ -24,7 +24,7 @@
 
 setup(
     name='m2r',
-    version='0.1.11',
+    version='0.1.12',
     description='Markdown and reStructuredText in a single file.',
     long_description=readme,
     author='Hiroyuki Takagi',

tests/test.md

@@ -3,3 +3,5 @@
 ## SubTitle
 
 __content__
+
+## サブタイトル

tests/test.rst

@@ -6,3 +6,6 @@ SubTitle
 --------
 
 **content**
+
+サブタイトル
+------------

tests/test_cli.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function, unicode_literals
+
 import sys
 import os
 from os import path
@@ -13,6 +15,9 @@
 if sys.version_info < (3, ):
     from mock import patch
     _builtin = '__builtin__'
+    from codecs import open as _open
+    from functools import partial
+    open = partial(_open, encoding='utf-8')
 else:
     from unittest.mock import patch
     _builtin = 'builtins'

tests/test_renderer.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
+from __future__ import print_function, unicode_literals
+
 from unittest import TestCase, skip
 
 from docutils.core import Publisher
@@ -338,6 +340,11 @@ def test_heading(self):
         out = self.conv(src)
         self.assertEqual(out, '\nhead 1\n' + '=' * 6 + '\n')
 
+    def test_heading_multibyte(self):
+        src = '# マルチバイト文字\n'
+        out = self.conv(src)
+        self.assertEqual(out, '\nマルチバイト文字\n' + '=' * 16 + '\n')
+
 
 class TestList(RendererTestBase):
     def test_ul(self):

tox.ini

@@ -22,7 +22,9 @@ commands =
   flake8 {toxinidir}/m2r.py {toxinidir}/setup.py {toxinidir}/tests
   coverage run -m unittest discover {toxinidir}/tests
   make -C {toxinidir} clean-testdoc
-  coverage run -a -m sphinx -b html -d {toxinidir}/docs/_build/toctree -E -W -n -j 4 -q {toxinidir}/docs {toxinidir}/docs/_build/html
+# only python 3.5 fails `-j 4`, why?
+  py35: coverage run -a -m sphinx -b html -d {toxinidir}/docs/_build/toctree -E -W -n -q {toxinidir}/docs {toxinidir}/docs/_build/html
+  pypy,py{27,34,36}: coverage run -a -m sphinx -b html -d {toxinidir}/docs/_build/toctree -E -W -n -j 4 -q {toxinidir}/docs {toxinidir}/docs/_build/html
   coverage report --include "*m2r.py,*m2r/tests*"
   make -C {toxinidir} clean