Removed deprecated code (#257)

* Removed deprecated code

Author: Nicklas Tegner

README.md

@@ -148,7 +148,7 @@ output = pypandoc.convert_text(
     'md', format='html',
     extra_args=['--atx-headers'])
 # output == '# Primary Heading\r\n'
-output = pypandoc.convert(
+output = pypandoc.convert_text(
     '# Primary Heading',
     'html', format='md',
     extra_args=['--base-header-level=2'])
@@ -174,9 +174,6 @@ Please pass any filters in as a list and not as a string.
 Please refer to `pandoc -h` and the
 [official documentation](https://pandoc.org/MANUAL.html) for further details.
 
-> Note: the old way of using `convert(input, output)` is deprecated as in some cases it wasn't
-possible to determine whether the input should be used as a filename or as text.
-
 ## Dealing with Formatting Arguments
 
 Pandoc supports custom formatting though `-V` parameter. In order to use it through

examples/services.py

@@ -43,7 +43,7 @@ def generate(self, html, **kwargs):
             '-o', self.file_object.name
         )
         # generate it using pandoc
-        self.service.convert(html, to_format, format=from_format, extra_args=extra_args)
+        self.service.convert_text(html, to_format, format=from_format, extra_args=extra_args)
         # return the file which is now populated with the docx forms
         return self.file_object
 
@@ -64,6 +64,6 @@ def generate(self, html, **kwargs):
             '-o', self.file_object.name
         )
         # generate it using pandoc
-        self.service.convert(html, to_format, format=from_format, extra_args=extra_args)
+        self.service.convert_text(html, to_format, format=from_format, extra_args=extra_args)
         # return the file which is now populated with the docx forms
         return self.file_object

pypandoc/__init__.py

@@ -8,7 +8,6 @@
 import sys
 import tempfile
 import textwrap
-import warnings
 
 from .handler import _check_log_handler
 from .pandoc_download import DEFAULT_TARGET_FOLDER, download_pandoc
@@ -24,56 +23,6 @@
 # Set up the module level logger
 logger = logging.getLogger(__name__)
 
-
-def convert(source, to, format=None, extra_args=(), encoding='utf-8',
-            outputfile=None, filters=None, cworkdir=None):
-    """Converts given `source` from `format` to `to` (deprecated).
-
-    :param str source: Unicode string or bytes or a file path (see encoding)
-
-    :param str to: format into which the input should be converted; can be one of
-            `pypandoc.get_pandoc_formats()[1]`
-
-    :param str format: the format of the inputs; will be inferred if input is a file with an
-            known filename extension; can be one of `pypandoc.get_pandoc_formats()[1]`
-            (Default value = None)
-
-    :param list extra_args: extra arguments (list of strings) to be passed to pandoc
-            (Default value = ())
-
-    :param str encoding: the encoding of the file or the input bytes (Default value = 'utf-8')
-
-    :param str outputfile: output will be written to outfilename or the converted content
-            returned if None (Default value = None)
-
-    :param list filters: pandoc filters e.g. filters=['pandoc-citeproc']
-
-    :returns: converted string (unicode) or an empty string if an outputfile was given
-    :rtype: unicode
-
-    :raises RuntimeError: if any of the inputs are not valid of if pandoc fails with an error
-    :raises OSError: if pandoc is not found; make sure it has been installed and is available at
-            path.
-    """
-    msg = ("Due to possible ambiguity, 'convert()' is deprecated and will be removed in pypandoc 1.8. "
-           "Use 'convert_file()'  or 'convert_text()'.")
-    warnings.warn(msg, DeprecationWarning, stacklevel=2)
-
-    path = _identify_path(source)
-    if path:
-        format = _identify_format_from_path(source, format)
-        input_type = 'path'
-    else:
-        source = _as_unicode(source, encoding)
-        input_type = 'string'
-        if not format:
-            raise RuntimeError("Format missing, but need one (identified source as text as no "
-                               "file with that name was found).")
-    return _convert_input(source, format, input_type, to, extra_args=extra_args,
-                          outputfile=outputfile, filters=filters,
-                          cworkdir=cworkdir)
-
-
 def convert_text(source, to, format, extra_args=(), encoding='utf-8',
                  outputfile=None, filters=None, verify_format=True,
                  sandbox=True, cworkdir=None):
@@ -690,7 +639,6 @@ def _ensure_pandoc_path():
 def ensure_pandoc_installed(url=None, 
                             targetfolder=None,
                             version="latest",
-                            quiet=None,
                             delete_installer=False):
     """Try to install pandoc if it isn't installed.
 
@@ -699,11 +647,6 @@ def ensure_pandoc_installed(url=None,
     :raises OSError: if pandoc cannot be installed
     """
 
-    if quiet is not None:
-        msg = ("The quiet flag in PyPandoc has been deprecated in favour of "
-               "logging. See README.md for more information.")
-        warnings.warn(msg, DeprecationWarning, stacklevel=2)
-
     # Append targetfolder to the PATH environment variable so it is found by subprocesses
     if targetfolder is not None:
         os.environ["PATH"] = os.environ.get("PATH", "") + os.pathsep + os.path.abspath(os.path.expanduser(targetfolder))

pypandoc/pandoc_download.py

@@ -9,7 +9,6 @@
 import subprocess
 import sys
 import tempfile
-import warnings
 
 try:
     from urllib.request import urlopen
@@ -193,7 +192,6 @@ def _handle_win32(filename, targetfolder):
 def download_pandoc(url=None,
                     targetfolder=None,
                     version="latest",
-                    quiet=None,
                     delete_installer=False,
                     download_folder=None):
     """Download and unpack pandoc
@@ -214,11 +212,6 @@ def download_pandoc(url=None,
         to the target folder. If no `download_folder` is given, uses the current directory. example: `/tmp/`, `/tmp`
     """
 
-    if quiet is not None:
-        msg = ("The quiet flag in PyPandoc has been deprecated in favour of "
-               "logging. See README.md for more information.")
-        warnings.warn(msg, DeprecationWarning, stacklevel=2)
-
     _check_log_handler()
 
     pf = sys.platform

tests.py

@@ -468,11 +468,6 @@ def test_convert_text_with_existing_file(self):
             received = pypandoc.convert_file(file_name, 'rst', format='md')
             self.assertTrue("title" in received)
 
-    def test_depreaction_warnings(self):
-        # convert itself is deprecated...
-        with assert_produces_warning(DeprecationWarning):
-            pypandoc.convert('# some title\n', to='rst', format='md')
-
     def create_sample_lua(self):
         args = [pypandoc.get_pandoc_path(), '--print-default-data-file', 'sample.lua']
         p = subprocess.Popen(args, stdout=subprocess.PIPE)