Commits

Takeshi Komiya committed f5a5ca2

seqdiag: Fix seqdiag_fontpath does not work

  • Participants
  • Parent commits 8f0a473

Comments (0)

Files changed (6)

File actdiag/sphinxcontrib/actdiag.py

 import actdiag.utils.rst.nodes
 import actdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.actdiag_fontpath
-        if isinstance(fontpath, actdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath:

File blockdiag/sphinxcontrib/blockdiag.py

 import blockdiag.utils.rst.nodes
 import blockdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.blockdiag_fontpath
-        if isinstance(fontpath, blockdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath:

File nwdiag/sphinxcontrib/nwdiag.py

 import nwdiag.utils.rst.nodes
 import nwdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.nwdiag_fontpath
-        if isinstance(fontpath, nwdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath:

File nwdiag/sphinxcontrib/packetdiag.py

 import packetdiag.utils.rst.nodes
 import packetdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.packetdiag_fontpath
-        if isinstance(fontpath, packetdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath:

File nwdiag/sphinxcontrib/rackdiag.py

 import rackdiag.utils.rst.nodes
 import rackdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.rackdiag_fontpath
-        if isinstance(fontpath, rackdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath:

File seqdiag/sphinxcontrib/seqdiag.py

 import seqdiag.utils.rst.nodes
 import seqdiag.utils.rst.directives
 from blockdiag.utils.bootstrap import detectfont
-from blockdiag.utils.compat import u
+from blockdiag.utils.compat import u, string_types
 from blockdiag.utils.fontmap import FontMap
 
 # fontconfig; it will be initialized on `builder-inited` event.
 
     try:
         fontpath = self.builder.config.seqdiag_fontpath
-        if isinstance(fontpath, seqdiag.utils.compat.string_types):
+        if isinstance(fontpath, string_types):
             fontpath = [fontpath]
 
         if fontpath: