fix #1631 -- make listings work on Windows

Kwpolska · Kwpolska · commit dea2d094838b · 2015-03-08T18:11:48.000+01:00
Signed-off-by: Chris Warrick &lt;kwpolska@gmail.com&gt;
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,3 +1,14 @@
+New in master
+=============
+
+Features
+--------
+
+Bugfixes
+--------
+
+* Listings in posts now work in Windows (Issue #1631)
+
 New in v7.3.1
 =============
 
diff --git a/nikola/plugins/compile/rest/listing.py b/nikola/plugins/compile/rest/listing.py
@@ -160,7 +160,8 @@ class Listing(Include):
     option_spec = listing_spec
 
     def run(self):
-        fname = self.arguments.pop(0)
+        _fname = self.arguments.pop(0)
+        fname = _fname.replace('/', os.sep)
         lang = self.arguments.pop(0)
         if len(self.folders) == 1:
             listings_folder = next(iter(self.folders.keys()))
@@ -177,9 +178,9 @@ def run(self):
         with io.open(fpath, 'r+', encoding='utf8') as fileobject:
             self.content = fileobject.read().splitlines()
         self.state.document.settings.record_dependencies.add(fpath)
-        target = urlunsplit(("link", 'listing', fpath, '', ''))
+        target = urlunsplit(("link", 'listing', fpath.replace('\\', '/'), '', ''))
         generated_nodes = (
-            [core.publish_doctree('`{0} <{1}>`_'.format(fname, target))[0]])
+            [core.publish_doctree('`{0} <{1}>`_'.format(_fname, target))[0]])
         generated_nodes += self.get_code_from_file(fileobject)
         return generated_nodes
 
diff --git a/nikola/plugins/task/listings.py b/nikola/plugins/task/listings.py
@@ -236,6 +236,7 @@ def render_listing(in_name, out_name, input_folder, output_folder, folders=[], f
                         }, self.kw["filters"])
 
     def listing_path(self, namep, lang):
+        namep = namep.replace('/', os.sep)
         nameh = namep + '.html'
         for name in (namep, nameh):
             if name in self.proper_input_file_mapping:
