summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-04-26 11:01:01 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-04-26 11:01:01 -0700
commitf26d60deacc2d4cbce37fb54602f491e12494557 (patch)
tree47e902235d8c246b069ff3306950b044eebf4e82
parente982e57fc3b4348bb601a8764ce2d17f0dc053ae (diff)
Use os.path.join in test/cmark.py.
For proper cross-platform paths.
-rw-r--r--test/cmark.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/test/cmark.py b/test/cmark.py
index 40e8c22..1110860 100644
--- a/test/cmark.py
+++ b/test/cmark.py
@@ -4,6 +4,7 @@
from ctypes import CDLL, c_char_p, c_long
from subprocess import *
import platform
+import os
def pipe_through_prog(prog, text):
p1 = Popen(prog.split(), stdout=PIPE, stdin=PIPE, stderr=PIPE)
@@ -22,17 +23,16 @@ class CMark:
self.to_html = lambda x: pipe_through_prog(prog, x)
else:
sysname = platform.system()
- libname = "libcmark"
if sysname == 'Darwin':
- libname += ".dylib"
+ libname = "libcmark.dylib"
elif sysname == 'Windows':
libname = "cmark.dll"
else:
- libname += ".so"
+ libname = "libcmark.so"
if library_dir:
- libpath = library_dir + "/" + libname
+ libpath = os.path.join(library_dir, libname)
else:
- libpath = "build/src/" + libname
+ libpath = os.path.join("build", "src", libname)
cmark = CDLL(libpath)
markdown = cmark.cmark_markdown_to_html
markdown.restype = c_char_p