Skip to content

C
cython
Commit bcfa729f authored by Stefan Behnel's avatar Stefan Behnel
Browse files
Options

always use decoded filenames in FileSourceDescriptor

parent 96b2e5a1
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
Cython/Compiler/Annotate.py
View file @ bcfa729f
...@@ -127,7 +127,7 @@ function toggleDiv(id) { ...@@ -127,7 +127,7 @@ function toggleDiv(id) {
""") """)
f.write(u'<body>\n') f.write(u'<body>\n')
f.write(u'<p>Generated by Cython %s on %s\n' % (Version.version, time.asctime())) f.write(u'<p>Generated by Cython %s on %s\n' % (Version.version, time.asctime()))
c_file = Utils.encode_filename(os.path.basename(target_filename)) c_file = Utils.decode_filename(os.path.basename(target_filename))
f.write(u'<p>Raw output: <a href="%s">%s</a>\n' % (c_file, c_file)) f.write(u'<p>Raw output: <a href="%s">%s</a>\n' % (c_file, c_file))
k = 0 k = 0
......
Cython/Compiler/Main.py
View file @ bcfa729f
...@@ -479,7 +479,7 @@ class Context(object): ...@@ -479,7 +479,7 @@ class Context(object):
def parse(self, source_desc, scope, pxd, full_module_name): def parse(self, source_desc, scope, pxd, full_module_name):
if not isinstance(source_desc, FileSourceDescriptor): if not isinstance(source_desc, FileSourceDescriptor):
raise RuntimeError("Only file sources for code supported") raise RuntimeError("Only file sources for code supported")
source_filename = Utils.encode_filename(source_desc.filename) source_filename = source_desc.filename
scope.cpp = self.cpp scope.cpp = self.cpp
# Parse the given source file and return a parse tree. # Parse the given source file and return a parse tree.
try: try:
......
Cython/Compiler/Scanning.py
View file @ bcfa729f
...@@ -166,6 +166,7 @@ class FileSourceDescriptor(SourceDescriptor): ...@@ -166,6 +166,7 @@ class FileSourceDescriptor(SourceDescriptor):
the position()-tuple. the position()-tuple.
""" """
def __init__(self, filename): def __init__(self, filename):
filename = Utils.decode_filename(filename)
self.filename = filename self.filename = filename
self.set_file_type_from_name(filename) self.set_file_type_from_name(filename)
self._cmp_name = filename self._cmp_name = filename
......
Cython/Utils.py
View file @ bcfa729f
...@@ -66,9 +66,9 @@ def path_exists(path): ...@@ -66,9 +66,9 @@ def path_exists(path):
pass pass
return False return False
# support for source file encoding detection # file name encodings
def encode_filename(filename): def decode_filename(filename):
if isinstance(filename, unicode): if isinstance(filename, unicode):
return filename return filename
try: try:
...@@ -80,6 +80,8 @@ def encode_filename(filename): ...@@ -80,6 +80,8 @@ def encode_filename(filename):
pass pass
return filename return filename
# support for source file encoding detection
_match_file_encoding = re.compile(u"coding[:=]\s*([-\w.]+)").search _match_file_encoding = re.compile(u"coding[:=]\s*([-\w.]+)").search
def detect_file_encoding(source_filename): def detect_file_encoding(source_filename):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7