fix use of '-' directory in static files

Under windows, the test for - to prevent using the html directory
for resolving static files did not work.

Fixed as part of getting test suite to run under windows.

Author: rouilj

CHANGES.txt

@@ -124,7 +124,8 @@ Fixed:
 - Fix anydbm session/otks clear() method on windows when backed by
   dumbdbm. Also make anydbm detect the initialized database when
   using dumbdbm. (John Rouillard)
-
+- Use of '-' directory in static_files config option under windows
+  Python fixed.
 
 Features:
 

doc/upgrading.txt

@@ -367,6 +367,14 @@ If you have modified that template, you can follow the analysis in
 `issue2551320 <https://issues.roundup-tracker.org/issue2551320>`_
 to fix your template.
 
+Fix static_files use of '-' directory (info)
+--------------------------------------------
+
+Use of the '-' directory in ``static_files`` config.ini setting now
+works. So it will prevent access to the html directory when using
+``@@file/`` based url's.
+
+
 Bad Login Rate Limiting and Locking (info)
 ------------------------------------------
 
@@ -410,8 +418,8 @@ before changing your PostgreSQL configuration, try changing the pragma
 ``10000``. In some cases this may be too high. See the `administration
 guide`_ for further details.
 
-roundup-admin's History Command Produces Readable Output
---------------------------------------------------------
+roundup-admin's History Command Produces Readable Output (info)
+---------------------------------------------------------------
 
 The history command of roundup-admin used to print the raw journal
 data. In this release the default is to produce more human readable

roundup/cgi/client.py

@@ -1934,9 +1934,10 @@ def serve_static_file(self, file):
 
             for p in prefix:
                 # if last element of STATIC_FILES ends with '/-',
-                # we failed to find the file and we should
-                # not look in TEMPLATES. So raise exception.
-                if dir_option == 'STATIC_FILES' and p[-2:] == '/-':
+                # or \- on windows, we failed to find the file
+                # and should not look in TEMPLATES. So raise exception.
+                if (dir_option == 'STATIC_FILES' and p[-1:] == '-' and
+                    p[-2:-1] in ('/', '\\')):
                     raise NotFound(file)
 
                 # ensure the load doesn't try to poke outside