Merge pull request JessicaTegner#6 from coldfix/python3-compatibility

Python3 compatibility

Author: bebraw

pypandoc/pypandoc.py renamed to pypandoc.py

@@ -1,7 +1,16 @@
+# -*- coding: utf-8 -*-
 from __future__ import with_statement
+
+__author__ = 'Juho Vepsäläinen'
+__version__ = '0.6.0'
+__license__ = 'MIT'
+__all__ = ['convert', 'get_pandoc_formats']
+
 import subprocess
 import os
 
+
+
 def convert(source, to, format=None, extra_args=()):
     '''Converts given `source` from `format` `to` another. `source` may be either a file path or a string to be converted. It's possible to pass `extra_args` if needed. In case `format` is not provided, it will try to invert the format based on given `source`.
 
@@ -47,17 +56,23 @@ def _process_file(source, to, format, extra_args):
     args = ['pandoc', '--from=' + format, '--to=' + to]
     args.extend(extra_args)
 
-    p = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+    p = subprocess.Popen(
+            args,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE)
 
-    return p.communicate(source)[0]
+    return p.communicate(source.encode())[0].decode()
 
 def get_pandoc_formats():
     '''
     Dynamic preprocessor for Pandoc formats.
     Return 2 lists. "from_formats" and "to_formats".
     ''' 
-    p = subprocess.Popen(['pandoc', '-h'], stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-    help_text = p.communicate()[0].splitlines(False)
+    p = subprocess.Popen(
+            ['pandoc', '-h'],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE)
+    help_text = p.communicate()[0].decode().splitlines(False)
     txt = ' '.join(help_text[1:help_text.index('Options:')])
 
     aux = txt.split('Output formats: ')

tests/pypandoc.spec renamed to pypandoc.spec

@@ -1,4 +1,4 @@
-from pypandoc import pypandoc
+import pypandoc
 
 def test_converter(to, format=None, extra_args=()):
     def reader(*args):

pypandoc/__init__.py

@@ -7,7 +7,7 @@
 try:
     long_description = pypandoc.convert('README.md', 'rst')
 except (IOError, OSError):
-    print 'check that you have installed pandoc properly and that README.md exists!'
+    print('check that you have installed pandoc properly and that README.md exists!')
     long_description = description
 
 module = pypandoc
@@ -20,8 +20,7 @@
     long_description = long_description,
     author = module.__author__,
     author_email = 'bebraw@gmail.com',
-    packages = ['pypandoc', ],
-    package_dir = {'pypandoc': 'pypandoc', },
+    py_modules = ['pypandoc', ],
     install_requires = ['setuptools', ],
     classifiers=[
         'Development Status :: 4 - Beta',
@@ -34,5 +33,5 @@
         'Topic :: Text Processing',
         'Topic :: Text Processing :: Filters',
     ],
-    test_suite = 'pypandoc'
+    test_suite = 'tests'
 )

setup.py

@@ -37,29 +37,29 @@ def test_does_not_convert_from_invalid_format(self):
     def test_basic_conversion_from_file(self):
         # This will not work on windows:
         # http://docs.python.org/2/library/tempfile.html
-        test_file = tempfile.NamedTemporaryFile(suffix='.md')
+        test_file = tempfile.NamedTemporaryFile('w+t', suffix='.md')
         file_name = test_file.name
         test_file.write('#some title\n')
         test_file.flush()
         expected = 'some title\n==========\n\n'
         received = pypandoc.convert(file_name, 'rst')
-        self.assertAlmostEqual(expected, received)
+        self.assertEqual(expected, received)
 
     def test_basic_conversion_from_file_with_format(self):
         # This will not work on windows:
         # http://docs.python.org/2/library/tempfile.html
-        test_file = tempfile.NamedTemporaryFile(suffix='.rst')
+        test_file = tempfile.NamedTemporaryFile('w+t', suffix='.rst')
         file_name = test_file.name
         test_file.write('#some title\n')
         test_file.flush()
         expected = 'some title\n==========\n\n'
         received = pypandoc.convert(file_name, 'rst', format='md')
-        self.assertAlmostEqual(expected, received)
+        self.assertEqual(expected, received)
 
     def test_basic_conversion_from_string(self):
         expected = 'some title\n==========\n\n'
         received = pypandoc.convert('#some title', 'rst', format='md')
-        self.assertAlmostEqual(expected, received)
+        self.assertEqual(expected, received)
 
 suite = unittest.TestLoader().loadTestsFromTestCase(TestPypandoc)
 unittest.TextTestRunner(verbosity=2).run(suite)