simplification in character_art

Author: fchapoton

src/sage/typeset/character_art_factory.py

@@ -37,8 +37,7 @@ def __init__(self,
         - ``art_type`` -- type of the character art (i.e. a subclass of
           :class:`~sage.typeset.character_art.CharacterArt`)
 
-        - ``string_type`` -- type of strings (the lines in the
-          character art, e.g. ``str`` or ``unicode``)
+        - ``string_type`` -- ignored (always ``str``)
 
         - ``magic_method_name`` -- name of the Sage magic method (e.g.
           ``'_ascii_art_'`` or ``'_unicode_art_'``)
@@ -60,8 +59,6 @@ def __init__(self,
             <class 'sage.typeset.character_art_factory.CharacterArtFactory'>
         """
         self.art_type = art_type
-        assert isinstance(string_type('a'), str)
-        self.string_type = string_type
         assert magic_method_name in ['_ascii_art_', '_unicode_art_']
         self.magic_method_name = magic_method_name
         self.left_parenthesis, self.right_parenthesis = parenthesis
@@ -204,13 +201,11 @@ def build_from_string(self, obj, baseline=0):
             bb
             ccc
         """
-        if self.string_type is str and not isinstance(obj, str):
+        if not isinstance(obj, str):
             if isinstance(obj, bytes):
                 obj = obj.decode('utf-8')
             else:
                 obj = str(obj)
-        if self.string_type is bytes and not isinstance(obj, bytes):
-            obj = str(obj).encode('utf-8')
         return self.art_type(obj.splitlines(), baseline=baseline)
 
     def build_container(self, content, left_border, right_border, baseline=0):
@@ -263,7 +258,7 @@ def build_container(self, content, left_border, right_border, baseline=0):
         left_border = left_border.character_art(h)
         right_border = right_border.character_art(h)
         lines = []
-        pad = self.string_type(' ')
+        pad = ' '
         for left, line, right in zip(left_border, matrix, right_border):
             lines.append(left + pad + line.ljust(w) + pad + right)
         shift = len(left_border) + len(pad)
@@ -295,7 +290,7 @@ def build_set(self, s, baseline=0):
             {            /\    /\      /\/\    /  \  }
             { /\/\/\, /\/  \, /  \/\, /    \, /    \ }
         """
-        comma = self.art_type([self.string_type(', ')], baseline=0)
+        comma = self.art_type([', '], baseline=0)
         repr_elems = self.concatenate(s, comma, nested=True)
         return self.build_container(
             repr_elems, self.left_curly_brace, self.right_curly_brace,
@@ -323,10 +318,10 @@ def build_dict(self, d, baseline=0):
             sage: ascii_art({'a': '', '': ''})
             { a:, : }
         """
-        comma = self.art_type([self.string_type(', ')],
+        comma = self.art_type([', '],
                               baseline=0,
                               breakpoints=[1])
-        colon = self.art_type([self.string_type(':')], baseline=0)
+        colon = self.art_type([':'], baseline=0)
 
         def concat_no_breakpoint(k, v):
             k = self.build(k)
@@ -378,7 +373,7 @@ def build_list(self, l, baseline=0):
               22, 23, 24, 25 ], [ 1, 2, 3, 4, 5 ],\n\n
               [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 ] ]'
         """
-        comma = self.art_type([self.string_type(', ')],
+        comma = self.art_type([', '],
                               baseline=0,
                               breakpoints=[1])
         repr_elems = self.concatenate(l, comma, nested=True)
@@ -397,7 +392,7 @@ def build_tuple(self, t, baseline=0):
             (            /\    /\      /\/\    /  \  )
             ( /\/\/\, /\/  \, /  \/\, /    \, /    \ )
         """
-        comma = self.art_type([self.string_type(', ')],
+        comma = self.art_type([', '],
                               baseline=0,
                               breakpoints=[1])
         repr_elems = self.concatenate(t, comma, nested=True)