aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Fitzgerald <fitzgen@gmail.com>2010-06-29 20:28:47 -0700
committerNick Fitzgerald <fitzgen@gmail.com>2010-06-29 20:28:47 -0700
commit92b749cfa26fafb3765aeb0be5486a16f9faa83d (patch)
tree063297b818b77bc7cc128b053672f269e9fe2d3e
parent2db5a687e974b7cf16053e69d0b2fbe3a0554b73 (diff)
downloadpycco-92b749cfa26fafb3765aeb0be5486a16f9faa83d.zip
pycco-92b749cfa26fafb3765aeb0be5486a16f9faa83d.tar.gz
Fixing bug with splitting fragments
-rw-r--r--pocco.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/pocco.py b/pocco.py
index 559e38b..40e4691 100644
--- a/pocco.py
+++ b/pocco.py
@@ -81,7 +81,7 @@ def highlight(source, sections):
output = output.replace(highlight_start, "").replace(highlight_end, "")
fragments = re.split(language["divider_html"], output)
for i, section in enumerate(sections):
- section["code_html"] = highlight_start + fragments[i] + highlight_end
+ section["code_html"] = highlight_start + shift(fragments, "") + highlight_end
section["docs_html"] = markdown(section["docs_text"])
section["num"] = i
@@ -137,7 +137,7 @@ for ext, l in languages.items():
# The mirror of `divider_text` that we expect Pygments to return. We can split
# on this to recover the original sections.
- l["divider_html"] = re.compile(r'\n*<span class="c">' + l["symbol"] + 'DIVIDER</span>\n*')
+ l["divider_html"] = re.compile(r'\n*<span class="c[1]?">' + l["symbol"] + 'DIVIDER</span>\n*')
# Get the Pygments Lexer for this language.
l["lexer"] = lexers.get_lexer_by_name(l["name"])
@@ -152,6 +152,14 @@ def destination(filepath):
name = filepath.replace(filepath[ filepath.rindex("."): ], "")
return "docs/" + path.basename(name) + ".html"
+# Shift items off the front of the `list` until it is empty, then return
+# `default`.
+def shift(list, default):
+ try:
+ return list.pop(0)
+ except IndexError:
+ return default
+
# Ensure that the destination directory exists.
def ensure_directory():
Popen(["mkdir", "-p", "docs"]).wait()