Fix old file() alias for open()
Change-Id: Icebfa5b2fb0c972be0324d18824523ba0e30aaab
This commit is contained in:
parent
128dcb85a8
commit
79d7c6e5f3
@ -38,7 +38,7 @@ class MeetBotTestCase(ChannelPluginTestCase):
|
|||||||
plugins = ('MeetBot',)
|
plugins = ('MeetBot',)
|
||||||
|
|
||||||
def testRunMeeting(self):
|
def testRunMeeting(self):
|
||||||
test_script = file(os.path.join("test-script-2.log.txt"))
|
test_script = open(os.path.join("test-script-2.log.txt"))
|
||||||
for line in test_script:
|
for line in test_script:
|
||||||
# Normalize input lines somewhat.
|
# Normalize input lines somewhat.
|
||||||
line = line.strip()
|
line = line.strip()
|
||||||
|
@ -742,7 +742,7 @@ if __name__ == '__main__':
|
|||||||
|
|
||||||
M = Meeting(channel=channel, owner=None,
|
M = Meeting(channel=channel, owner=None,
|
||||||
filename=filename, writeRawLog=False)
|
filename=filename, writeRawLog=False)
|
||||||
for line in file(sys.argv[2]):
|
for line in open(sys.argv[2]):
|
||||||
# match regular spoken lines:
|
# match regular spoken lines:
|
||||||
m = logline_re.match(line)
|
m = logline_re.match(line)
|
||||||
if m:
|
if m:
|
||||||
|
@ -323,7 +323,7 @@ class _CSSmanager(object):
|
|||||||
# Stylesheet specified
|
# Stylesheet specified
|
||||||
if getattr(self.M.config, 'cssEmbed_'+name, True):
|
if getattr(self.M.config, 'cssEmbed_'+name, True):
|
||||||
# external stylesheet
|
# external stylesheet
|
||||||
css = file(css_fname).read()
|
css = open(css_fname).read()
|
||||||
return self._css_head%css
|
return self._css_head%css
|
||||||
else:
|
else:
|
||||||
# linked stylesheet
|
# linked stylesheet
|
||||||
|
@ -100,7 +100,7 @@ class MeetBotTest(unittest.TestCase):
|
|||||||
"""
|
"""
|
||||||
tmpdir = tempfile.mkdtemp(prefix='test-meetbot')
|
tmpdir = tempfile.mkdtemp(prefix='test-meetbot')
|
||||||
try:
|
try:
|
||||||
process_meeting(contents=file('test-script-1.log.txt').read(),
|
process_meeting(contents=open('test-script-1.log.txt').read(),
|
||||||
filename=os.path.join(tmpdir, 'meeting'),
|
filename=os.path.join(tmpdir, 'meeting'),
|
||||||
dontSave=False,
|
dontSave=False,
|
||||||
extraConfig={'writer_map':self.full_writer_map,
|
extraConfig={'writer_map':self.full_writer_map,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user