Updated 'print' statements throughout Appy code, in order to be Python3x as well as Python2x-compliant.

This commit is contained in:
Gaetan Delannay 2013-05-30 00:46:11 +02:00
parent e8c63f225f
commit 0c50fe188a
24 changed files with 92 additions and 92 deletions

View file

@ -333,7 +333,7 @@ class TableParser:
if self.specialChars.has_key(specialChar):
self.contentBuffer.write(self.specialChars[specialChar])
else:
print 'Warning: char %d not known.' % specialChar
print('Warning: char %d not known.' % specialChar)
self.state = TableParser.READING_CONTENT
def bufferize(self, char):
if self.state == TableParser.READING_CONTROL_WORD:
@ -497,7 +497,6 @@ class RtfTablesParser:
if __name__ =='__main__':
tables = RtfTablesParser("Tests.rtf").parse()
for key, item in tables.iteritems():
print 'Table %s' % key
print item
print
print('Table %s' % key)
print(item)
# -----------------------------------------------------------------------------

View file

@ -71,7 +71,7 @@ class TestReport:
raise InternalError(TEST_REPORT_SINGLETON_ERROR)
def say(self, msg, force=False, encoding=None):
if self.verbose or force:
print msg
print(msg)
if encoding:
self.report.write(msg.encode(encoding))
else:

View file

@ -40,7 +40,7 @@ def cleanFolder(folder, exts=extsToClean, folders=(), verbose=False):
'''This function allows to remove, in p_folder and subfolders, any file
whose extension is in p_exts, and any folder whose name is in
p_folders.'''
if verbose: print 'Cleaning folder', folder, '...'
if verbose: print('Cleaning folder %s...' % folder)
# Remove files with an extension listed in p_exts
if exts:
for root, dirs, files in os.walk(folder):
@ -48,7 +48,7 @@ def cleanFolder(folder, exts=extsToClean, folders=(), verbose=False):
ext = os.path.splitext(fileName)[1]
if (ext in exts) or ext.endswith('~'):
fileToRemove = os.path.join(root, fileName)
if verbose: print 'Removing file %s...' % fileToRemove
if verbose: print('Removing file %s...' % fileToRemove)
os.remove(fileToRemove)
# Remove folders whose names are in p_folders.
if folders:
@ -56,7 +56,7 @@ def cleanFolder(folder, exts=extsToClean, folders=(), verbose=False):
for folderName in dirs:
if folderName in folders:
toDelete = os.path.join(root, folderName)
if verbose: print 'Removing folder %s...' % toDelete
if verbose: print('Removing folder %s...' % toDelete)
FolderDeleter.delete(toDelete)
# ------------------------------------------------------------------------------
@ -393,8 +393,8 @@ class CodeAnalysis:
if not lines: return
commentRate = (self.commentLines / float(lines)) * 100.0
blankRate = (self.emptyLines / float(lines)) * 100.0
print '%s: %d files, %d lines (%.0f%% comments, %.0f%% blank)' % \
(self.name, self.numberOfFiles, lines, commentRate, blankRate)
print('%s: %d files, %d lines (%.0f%% comments, %.0f%% blank)' % \
(self.name, self.numberOfFiles, lines, commentRate, blankRate))
# ------------------------------------------------------------------------------
class LinesCounter:

View file

@ -214,10 +214,10 @@ class XmlParser(ContentHandler, ErrorHandler):
# ErrorHandler methods ---------------------------------------------------
def error(self, error):
if self.raiseOnError: raise error
else: print 'SAX error', error
else: print('SAX error %s' % str(error))
def fatalError(self, error):
if self.raiseOnError: raise error
else: print 'SAX fatal error', error
else: print('SAX fatal error %s' % str(error))
def warning(self, error): pass
def parse(self, xml, source='string'):
@ -940,17 +940,17 @@ class XmlComparator:
msg = 'Difference(s) detected between files %s and %s:' % \
(self.fileNameA, self.fileNameB)
if report: report.say(msg, encoding='utf-8')
else: print msg
else: print(msg)
atLeastOneDiff = True
if not lastLinePrinted:
if report: report.say('...')
else: print '...'
else: print('...')
if self.areXml:
if report: report.say(line, encoding=encoding)
else: print line
else: print(line)
else:
if report: report.say(line[:-1], encoding=encoding)
else: print line[:-1]
else: print(line[:-1])
lastLinePrinted = True
else:
lastLinePrinted = False