#432 [frontend] f31 has 'commonmark' module, not 'CommonMark'
Closed 5 years ago by praiskup. Opened 5 years ago by praiskup.
Unknown source common-mark-rawhide  into  master

@@ -3,7 +3,12 @@

  import pytz

  import time

  

- import CommonMark

+ try:

+     import commonmark

+ except:

+     # needed for Fedora <= 29

+     import CommonMark as commonmark

+ 

  from pygments import highlight

  from pygments.lexers import get_lexer_by_name, guess_lexer

  from pygments.lexers.special import TextLexer
@@ -19,7 +24,7 @@

  from coprs import app

  from coprs import helpers

  

- class CoprHtmlRenderer(CommonMark.HtmlRenderer):

+ class CoprHtmlRenderer(commonmark.HtmlRenderer):

      def code_block(self, node, entering):

          info_words = node.info.split() if node.info else []

          attrs = self.attrs(node)
@@ -27,7 +32,7 @@

  

          if len(info_words) > 0 and len(info_words[0]) > 0:

              attrs.append(['class', 'language-' +

-                           CommonMark.common.escape_xml(info_words[0], True)])

+                           commonmark.common.escape_xml(info_words[0], True)])

              try:

                  lexer = get_lexer_by_name(info_words[0])

              except ClassNotFound:
@@ -173,7 +178,7 @@

      if not data:

          return ''

  

-     parser = CommonMark.Parser()

+     parser = commonmark.Parser()

      renderer = CoprHtmlRenderer()

  

      return Markup(renderer.render(parser.parse(data)))

no initial comment

I would prefer 'import CommonMark as commonmark' and to put here comment that this is because F30-

rebased onto 8fcb5582949894839344b3d45dac01243360ab00

5 years ago

Updated, thanks for the review.

rebased onto a7d0b09008e4765bc77de376e3d27c5f70045ff8

5 years ago

Merge button broken, merged manually as c8357d6a6b97b07072de1f951838e52e36b7503f

Pull-Request has been closed by praiskup

5 years ago

Meh, I can not push now.

Pull-Request has been reopened by praiskup

5 years ago

rebased onto 49815e6

5 years ago

Ok, merged manually finally. 49815e6

Pull-Request has been closed by praiskup

5 years ago
Metadata