- From d9a893bf60e0e028259c953f2c9e272f0ae1b6c9 Mon Sep 17 00:00:00 2001

- From: Karthikeyan Singaravelan <tir.karthi@gmail.com>

- Date: Sat, 22 Feb 2020 21:32:21 +0530

- Subject: [PATCH] Use encodebytes instead of encodestring in Python 3.9.

- 

- ---

-  nbconvert/preprocessors/svg2pdf.py | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py

- index 3a1aa22a..33514ecc 100644

- --- a/nbconvert/preprocessors/svg2pdf.py

- +++ b/nbconvert/preprocessors/svg2pdf.py

- @@ -123,6 +123,6 @@ def convert_figure(self, data_format, data):

-              if os.path.isfile(output_filename):

-                  with open(output_filename, 'rb') as f:

-                      # PDF is a nb supported binary, data type, so base64 encode.

- -                    return base64.encodestring(f.read())

- +                    return base64.encodebytes(f.read())

-              else:

-                  raise TypeError("Inkscape svg to pdf conversion failed")

- From 1083fcf9c900131748ecd2631722bfa179e53100 Mon Sep 17 00:00:00 2001

- From: =?UTF-8?q?Lum=C3=ADr=20=27Frenzy=27=20Balhar?=

-  <frenzy.madness@gmail.com>

- Date: Fri, 27 Mar 2020 09:24:15 +0100

- Subject: [PATCH] cElementTree no longer exists in Python 3.9

- 

- Fixes: https://github.com/jupyter/nbconvert/issues/1221

- ---

-  nbconvert/filters/strings.py | 4 ++--

-  1 file changed, 2 insertions(+), 2 deletions(-)

- 

- diff --git a/nbconvert/filters/strings.py b/nbconvert/filters/strings.py

- index 2673d661..9ae82a13 100755

- --- a/nbconvert/filters/strings.py

- +++ b/nbconvert/filters/strings.py

- @@ -19,8 +19,8 @@

-      from urllib2 import quote  # Py 2

-  

-  # defusedxml does safe(r) parsing of untrusted XML data

- -from defusedxml import cElementTree as ElementTree

- -from xml.etree.cElementTree import Element

- +from defusedxml import ElementTree

- +from xml.etree.ElementTree import Element

-  

-  from ipython_genutils import py3compat

-  

- diff --git a/nbconvert/preprocessors/svg2pdf.py b/nbconvert/preprocessors/svg2pdf.py

- index 60b23b8..e100042 100644

- --- a/nbconvert/preprocessors/svg2pdf.py

- +++ b/nbconvert/preprocessors/svg2pdf.py

- @@ -53,7 +53,7 @@ class SVG2PDFPreprocessor(ConvertFiguresPreprocessor):

-      @default('command')

-      def _command_default(self):

-          return self.inkscape + \

- -               ' --without-gui --export-pdf="{to_filename}" "{from_filename}"'

- +               ' --export-filename="{to_filename}" "{from_filename}"'

-      

-      inkscape = Unicode(help="The path to Inkscape, if necessary").tag(config=True)

-      @default('inkscape')

- Version:        6.1.0

- Release:        4%{?dist}

- # We have inkscape version 1; source tarball is looking for rc1

- # without this change some tests fail

- sed -i "s/1.0beta2/1.0.1/" nbconvert/preprocessors/tests/test_svg2pdf.py

- %{__python3} -m pytest -v -k "not test_webpdf_without_chromium and not test_pdf and not test_webpdf_with_chromium and not test_export and not test_filename_accent and not test_filename_spaces and not test_linked_images and not test_absolute_template_file and not test_clear_output and not test_png_base64_html_ok and not test_relative_template_file"

- SHA512 (nbconvert-6.1.0.tar.gz) = b28aa4935e5be522bb123eedf26ea993b884ef84f3145a1b1beb6f7ba74ed60edc56877da1eb51bbf8ab01ab526f74c87f756a38eee03b1b2b55551728510de3