Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: simplify internal staticfile return codes
authorMads Kiilerich <mads@kiilerich.com>
Sun, 10 Feb 2013 18:24:29 +0100
changeset 18645 76ff3a715cf2
parent 18644 3e92772d5383
child 18646 c6a81e54c209
hgweb: simplify internal staticfile return codes
mercurial/hgweb/common.py file | annotate | diff | comparison | revisions
mercurial/hgweb/hgwebdir_mod.py file | annotate | diff | comparison | revisions
mercurial/hgweb/webcommands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/hgweb/common.py	Sun Feb 10 18:24:29 2013 +0100
+++ b/mercurial/hgweb/common.py	Sun Feb 10 18:24:29 2013 +0100
@@ -129,7 +129,7 @@
     for part in parts:
         if (part in ('', os.curdir, os.pardir) or
             os.sep in part or os.altsep is not None and os.altsep in part):
-            return ""
+            return
     fpath = os.path.join(*parts)
     if isinstance(directory, str):
         directory = [directory]
@@ -144,7 +144,6 @@
         data = fp.read()
         fp.close()
         req.respond(HTTP_OK, ct, body=data)
-        return ""
     except TypeError:
         raise ErrorResponse(HTTP_SERVER_ERROR, 'illegal filename')
     except OSError, err:
--- a/mercurial/hgweb/hgwebdir_mod.py	Sun Feb 10 18:24:29 2013 +0100
+++ b/mercurial/hgweb/hgwebdir_mod.py	Sun Feb 10 18:24:29 2013 +0100
@@ -197,7 +197,8 @@
                         if isinstance(tp, str):
                             tp = [tp]
                         static = [os.path.join(p, 'static') for p in tp]
-                    return (staticfile(static, fname, req),)
+                    staticfile(static, fname, req)
+                    return []
 
                 # top-level index
                 elif not virtual:
--- a/mercurial/hgweb/webcommands.py	Sun Feb 10 18:24:29 2013 +0100
+++ b/mercurial/hgweb/webcommands.py	Sun Feb 10 18:24:29 2013 +0100
@@ -842,7 +842,8 @@
         if isinstance(tp, str):
             tp = [tp]
         static = [os.path.join(p, 'static') for p in tp]
-    return [staticfile(static, fname, req)]
+    staticfile(static, fname, req)
+    return []
 
 def graph(web, req, tmpl):
Mercurial