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

Basic unicode support for IDF4 #66

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Basic unicode support for IDF4 #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions eppy/bunch_subclass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ def __getattr__(self, name):
raise BadEPFieldError(astr)
def __repr__(self):
"""print this as an idf snippet"""
lines = [str(val) for val in self.obj]
comments = [comm.replace('_', ' ') for comm in self.objls]
lines[0] = "%s," % (lines[0], ) # comma after first line
lines = [unicode(val) for val in self.obj]
comments = [comm.replace(u'_', u' ') for comm in self.objls]
lines[0] = u"%s," % (lines[0], ) # comma after first line
for i, line in enumerate(lines[1:-1]):
lines[i + 1] = ' %s,' % (line, ) # indent and comma
lines[-1] = ' %s;' % (lines[-1], )# ';' after last line
lines[i + 1] = u' %s,' % (line, ) # indent and comma
lines[-1] = u' %s;' % (lines[-1], )# ';' after last line
lines = [line.ljust(26) for line in lines] # ljsut the lines
filler = '%s !- %s'
filler = u'%s !- %s'
nlines = [filler % (line, comm) for line,
comm in zip(lines[1:], comments[1:])]# adds comments to line
nlines.insert(0, lines[0])# first line without comment
astr = '\n'.join(nlines)
return '\n%s\n' % (astr, )
astr = u'\n'.join(nlines)
return u'\n%s\n' % (astr, )

class EpBunch_2(EpBunch_1):
"""Has data, aliases in bunch"""
Expand Down
10 changes: 5 additions & 5 deletions eppy/modeleditor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,14 +667,14 @@ def save(self, filename=None, lineendings='default'):
if lineendings == 'default':
pass
elif lineendings == 'windows':
s = '!- Windows Line endings \n' + s
s = u'!- Windows Line endings \n' + s
slines = s.splitlines()
s = '\r\n'.join(slines)
s = u'\r\n'.join(slines)
elif lineendings == 'unix':
s = '!- Unix Line endings \n' + s
s = u'!- Unix Line endings \n' + s
slines = s.splitlines()
s = '\n'.join(slines)
open(filename, 'w').write(s)
s = u'\n'.join(slines)
open(filename, 'w').write(s.encode('utf-8')
def saveas(self, filename, lineendings='default'):
self.idfname = filename
self.save(lineendings=lineendings)
Expand Down