1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
Description: Fixes test_fontmap_duplicated_fontentry1
Deprecated specificatoin for Python 2 at test_fontmap_duplicated_fontentry1.
Author: Kouhei Maeda <mkouhei@palmtb.net>
Last-Update: 2017-05-26
Index: blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_utils_fontmap.py
===================================================================
--- blockdiag-1.5.3+dfsg.orig/src/blockdiag/tests/test_utils_fontmap.py 2015-02-21 18:38:44.000000000 +0900
+++ blockdiag-1.5.3+dfsg/src/blockdiag/tests/test_utils_fontmap.py 2017-05-26 00:32:40.736523308 +0900
@@ -3,6 +3,7 @@
import os
import sys
import tempfile
+import configparser
from io import StringIO
from collections import namedtuple
from blockdiag.utils.compat import u
@@ -210,17 +211,8 @@
_config = u("[fontmap]\nsansserif: %s\nsansserif: %s\n") % \
(self.fontpath[0], self.fontpath[1])
config = StringIO(_config)
- if sys.version_info[0] == 2:
- fmap = FontMap(config)
-
- font1 = fmap.find()
- self.assertEqual('sans-serif', font1.generic_family)
- self.assertEqual(self.fontpath[1], font1.path)
- self.assertEqual(11, font1.size)
- else:
- import configparser
- with self.assertRaises(configparser.DuplicateOptionError):
- FontMap(config)
+ with self.assertRaises(configparser.DuplicateOptionError):
+ FontMap(config)
def test_fontmap_duplicated_fontentry2(self):
# this testcase is only for python2.6 or later
|
