merge from upsteam

Author: rouilj

CHANGES.txt

@@ -68,6 +68,8 @@ Fixed:
   multilink. (Joseph Myers)
 - issue2550992: avoid errors from invalid Authorization
   headers. (Joseph Myers)
+- issue2551022: support non-ASCII prefixes in instance config for
+  finding static files. (C�dric Krier)
 
 
 2018-07-13 1.6.0

roundup/cgi/client.py

@@ -48,7 +48,7 @@ class SysCallError(Exception):
 from email.mime.multipart import MIMEMultipart
 import roundup.anypy.email_
 
-from roundup.anypy.strings import s2b, b2s, uchr
+from roundup.anypy.strings import s2b, b2s, uchr, is_us
 
 def initialiseSecurity(security):
     '''Create some Permissions and Roles on the security object
@@ -1511,7 +1511,7 @@ def serve_static_file(self, file):
             prefix = self.instance.config[dir_option]
             if not prefix:
                 continue
-            if type(prefix) is str:
+            if is_us(prefix):
                 # prefix can be a string or list depending on
                 # option. Make it a list to iterate over.
                 prefix = [ prefix ]