From ab1f040aaaa520e29fa813fefd9747ca5fca03c3 Mon Sep 17 00:00:00 2001 From: Martin Thompson Date: Mon, 5 Jul 2010 21:00:05 +0100 Subject: [PATCH] Working on non-ascii characters in zipfiles --- openlp/plugins/songs/lib/test/test_importing_lots.py | 10 +++++----- openlp/plugins/songs/lib/test/test_opensongimport.py | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/openlp/plugins/songs/lib/test/test_importing_lots.py b/openlp/plugins/songs/lib/test/test_importing_lots.py index 0abc6d3e1..4b97bf42b 100644 --- a/openlp/plugins/songs/lib/test/test_importing_lots.py +++ b/openlp/plugins/songs/lib/test/test_importing_lots.py @@ -9,10 +9,10 @@ import codecs def opensong_import_lots(): ziploc=u'/home/mjt/openlp/OpenSong_Data/' files=[] - files=['test.opensong.zip'] - files.extend(glob(ziploc+u'Songs.zip')) - files.extend(glob(ziploc+u'SOF.zip')) - # files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip')) + files=[u'test.opensong.zip', ziploc+u'ADond.zip'] + #files.extend(glob(ziploc+u'Songs.zip')) + #files.extend(glob(ziploc+u'SOF.zip')) + files.extend(glob(ziploc+u'spanish_songs_for_opensong.zip')) # files.extend(glob(ziploc+u'opensong_*.zip')) errfile=codecs.open(u'import_lots_errors.txt', u'w', u'utf8') manager=SongManager() @@ -47,7 +47,7 @@ def opensong_import_lots(): print_exc(3) sys.exit(1) # continue - o.finish() + #o.finish() print "OK" #os.unlink(filename) # o.song.print_song() diff --git a/openlp/plugins/songs/lib/test/test_opensongimport.py b/openlp/plugins/songs/lib/test/test_opensongimport.py index f847b273b..d3d8d356a 100644 --- a/openlp/plugins/songs/lib/test/test_opensongimport.py +++ b/openlp/plugins/songs/lib/test/test_opensongimport.py @@ -28,6 +28,9 @@ from openlp.plugins.songs.lib.manager import SongManager def test(): manager = SongManager() o = OpenSongImport(manager) + o.do_import(u'/home/mjt/openlp/OpenSong_Data/ADond', commit=False) + o.song.print_song() + sys.exit(1) o.do_import(u'test.opensong', commit=False) # o.finish() o.song.print_song()