Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

pp_ser: handle unicode characters in the source file with Python 3 #249

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

pp_ser: handle unicode characters in the source file with Python 3 #249

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab62eb3
pp_ser: avoid explicit conversion of native strings to bytes
skosukhin Feb 11, 2021
08e470f
pp_ser: compatibility with old Python3 installations
skosukhin Jun 1, 2021
e165cb5
pp_ser: handle UTF-8 conversion errors
skosukhin Oct 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 28 additions & 8 deletions src/serialbox-python/pp_ser/pp_ser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,33 @@
__email__ = 'oliver.fuhrer@meteoswiss.ch'


def to_ascii(text):
def open23(name, mode='r'):
if sys.version_info[0] == 3:
return bytes(text, 'ascii')
return open(name, mode,
encoding=(None if 'b' in mode else 'UTF-8'),
errors=(None if 'b' in mode else 'surrogateescape'))
else:
return open(name, mode)


def bytes23(text):
if sys.version_info[0] == 3:
return bytes(text, 'UTF-8', 'surrogateescape')
else:
return str(text)


def getline(filename, lineno):
try:
return linecache.getline(filename, lineno)
except:
with open23(filename, 'r') as f:
for i, line in enumerate(f, start=1):
if i == lineno:
return line
return ''


def filter_fortran(f):
return (f.split('.')[-1].lower() in ['f90', 'inc', 'incf', 'f', 'f03'])

Expand Down Expand Up @@ -709,12 +729,12 @@ def __re_subroutine_function(self):
lookahead_index = self.__linenum + 1

# look ahead
nextline = linecache.getline(os.path.join(self.infile), lookahead_index)
nextline = getline(os.path.join(self.infile), lookahead_index)
r_continued_line = re.compile('^([^!]*)&', re.IGNORECASE)
while r_continued_line.search(nextline):
self.__line += nextline
lookahead_index += 1
nextline = linecache.getline(os.path.join(self.infile), lookahead_index)
nextline = getline(os.path.join(self.infile), lookahead_index)
self.__line += nextline
self.__skip_next_n_lines = lookahead_index - self.__linenum
self.__produce_use_stmt()
Expand Down Expand Up @@ -809,12 +829,12 @@ def __re_def(self):
# set to line after the intent declaration
lookahead_index += 1
# look ahead
nextline = linecache.getline(os.path.join(self.infile), lookahead_index)
nextline = getline(os.path.join(self.infile), lookahead_index)
while nextline:
self.__check_intent_in(nextline)
if nextline.find('&') != -1:
lookahead_index += 1
nextline = linecache.getline(os.path.join(self.infile), lookahead_index)
nextline = getline(os.path.join(self.infile), lookahead_index)
else:
nextline = None

Expand Down Expand Up @@ -902,7 +922,7 @@ def parse(self, generate=False):
self.__outputBuffer += '#define ACC_PREFIX !$acc\n'

# open and parse file
input_file = open(os.path.join(self.infile), 'r')
input_file = open23(os.path.join(self.infile), 'r')
try:
self.line = ''
for line in input_file:
Expand Down Expand Up @@ -947,7 +967,7 @@ def preprocess(self):
output_file = tempfile.NamedTemporaryFile(delete=False)
# same permissions as infile
os.chmod(output_file.name, os.stat(self.infile).st_mode)
output_file.write(to_ascii(self.__outputBuffer))
output_file.write(bytes23(self.__outputBuffer))
output_file.close()
useit = True
if os.path.isfile(self.outfile) and not self.identical:
Expand Down