From 4f38ee259dff447958ec4671e7c700cbf62ba14c Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Sat, 7 May 2016 18:53:47 -0700 Subject: [PATCH] Remove imp_unittest --- bin/make-new-etg-file.py | 2 +- bin/make-new-unittest-file.py | 2 +- unittests/imp_unittest.py | 10 ---------- unittests/runtests.py | 2 +- unittests/test_aboutdlg.py | 2 +- unittests/test_accel.py | 2 +- unittests/test_affinematrix2d.py | 2 +- unittests/test_animate.py | 2 +- unittests/test_app.py | 2 +- unittests/test_apptrait.py | 2 +- unittests/test_arrayint.py | 2 +- unittests/test_arraystring.py | 2 +- unittests/test_artprov.py | 2 +- unittests/test_asserts.py | 2 +- unittests/test_bannerwindow.py | 2 +- unittests/test_bitmap.py | 2 +- unittests/test_bmpbuttn.py | 2 +- unittests/test_bmpcbox.py | 2 +- unittests/test_bookctrl.py | 2 +- unittests/test_brush.py | 2 +- unittests/test_busyinfo.py | 2 +- unittests/test_button.py | 2 +- unittests/test_calctrl.py | 2 +- unittests/test_caret.py | 2 +- unittests/test_checkbox.py | 2 +- unittests/test_checklst.py | 2 +- unittests/test_choicdlg.py | 2 +- unittests/test_choice.py | 2 +- unittests/test_choicebk.py | 2 +- unittests/test_clipbrd.py | 2 +- unittests/test_clntdatactnr.py | 2 +- unittests/test_cmdproc.py | 2 +- unittests/test_cmndata.py | 2 +- unittests/test_collpane.py | 2 +- unittests/test_colordlg.py | 2 +- unittests/test_colour.py | 2 +- unittests/test_combo.py | 2 +- unittests/test_combobox.py | 2 +- unittests/test_commandlinkbutton.py | 2 +- unittests/test_config.py | 2 +- unittests/test_control.py | 2 +- unittests/test_cshelp.py | 2 +- unittests/test_cursor.py | 2 +- unittests/test_dataobj.py | 2 +- unittests/test_dataview.py | 2 +- unittests/test_datectrl.py | 2 +- unittests/test_dateevt.py | 2 +- unittests/test_dc.py | 2 +- unittests/test_dcDrawLists.py | 2 +- unittests/test_dcbuffer.py | 2 +- unittests/test_dcclient.py | 2 +- unittests/test_dcgraph.py | 2 +- unittests/test_dcmemory.py | 2 +- unittests/test_dcmirror.py | 2 +- unittests/test_dcprint.py | 2 +- unittests/test_dcps.py | 2 +- unittests/test_dcscreen.py | 2 +- unittests/test_dcsvg.py | 2 +- unittests/test_deadobj.py | 2 +- unittests/test_debug.py | 2 +- unittests/test_defs.py | 2 +- unittests/test_dialog.py | 2 +- unittests/test_dirctrl.py | 2 +- unittests/test_dirdlg.py | 2 +- unittests/test_display.py | 2 +- unittests/test_dnd.py | 2 +- unittests/test_dragimag.py | 2 +- unittests/test_editlbox.py | 2 +- unittests/test_event.py | 2 +- unittests/test_fdrepdlg.py | 2 +- unittests/test_filectrl.py | 2 +- unittests/test_filedlg.py | 2 +- unittests/test_filehistory.py | 2 +- unittests/test_filesys.py | 2 +- unittests/test_font.py | 2 +- unittests/test_fontdlg.py | 2 +- unittests/test_fontenum.py | 2 +- unittests/test_fontmap.py | 2 +- unittests/test_fontutil.py | 2 +- unittests/test_frame.py | 2 +- unittests/test_fswatcher.py | 2 +- unittests/test_gauge.py | 2 +- unittests/test_gbsizer.py | 2 +- unittests/test_gdicmn.py | 2 +- unittests/test_geometry.py | 2 +- unittests/test_glcanvas.py | 2 +- unittests/test_graphics.py | 2 +- unittests/test_grid.py | 2 +- unittests/test_headercol.py | 2 +- unittests/test_headerctrl.py | 2 +- unittests/test_help.py | 2 +- unittests/test_helpctrl.py | 2 +- unittests/test_helpdata.py | 2 +- unittests/test_helpdlg.py | 2 +- unittests/test_helpext.py | 2 +- unittests/test_helpfrm.py | 2 +- unittests/test_helpwnd.py | 2 +- unittests/test_htmlcell.py | 2 +- unittests/test_htmldefs.py | 2 +- unittests/test_htmllbox.py | 2 +- unittests/test_htmlpars.py | 2 +- unittests/test_htmlprint.py | 2 +- unittests/test_htmlwin.py | 2 +- unittests/test_htmlwinpars.py | 2 +- unittests/test_hyperlink.py | 2 +- unittests/test_icon.py | 2 +- unittests/test_iconbndl.py | 2 +- unittests/test_iconloc.py | 2 +- unittests/test_image.py | 2 +- unittests/test_imaglist.py | 2 +- unittests/test_infobar.py | 2 +- unittests/test_intl.py | 2 +- unittests/test_joystick.py | 2 +- unittests/test_kbdstate.py | 2 +- unittests/test_layout.py | 2 +- unittests/test_laywin.py | 2 +- unittests/test_lib_agw_advancedsplash.py | 2 +- unittests/test_lib_agw_aquabutton.py | 2 +- unittests/test_lib_agw_aui.py | 2 +- unittests/test_lib_agw_aui_dockart.py | 2 +- unittests/test_lib_agw_aui_tabart.py | 2 +- unittests/test_lib_agw_aui_utilities.py | 2 +- unittests/test_lib_agw_balloontip.py | 2 +- unittests/test_lib_agw_buttonpanel.py | 2 +- unittests/test_lib_agw_cubecolourdialog.py | 2 +- unittests/test_lib_agw_customtreectrl.py | 2 +- unittests/test_lib_agw_flatmenu.py | 2 +- unittests/test_lib_agw_flatnotebook.py | 2 +- unittests/test_lib_agw_floatspin.py | 2 +- unittests/test_lib_agw_fmcustomizedlg.py | 2 +- unittests/test_lib_agw_foldpanelbar.py | 2 +- unittests/test_lib_agw_fourwaysplitter.py | 2 +- unittests/test_lib_agw_genericmessagedialog.py | 2 +- unittests/test_lib_agw_gradientbutton.py | 2 +- unittests/test_lib_agw_hyperlink.py | 2 +- unittests/test_lib_agw_hypertreelist.py | 2 +- unittests/test_lib_agw_infobar.py | 2 +- unittests/test_lib_agw_knobctrl.py | 2 +- unittests/test_lib_agw_labelbook.py | 2 +- unittests/test_lib_agw_multidirdialog.py | 2 +- unittests/test_lib_agw_peakmeter.py | 2 +- unittests/test_lib_agw_persist_persistencemanager.py | 2 +- unittests/test_lib_agw_piectrl.py | 2 +- unittests/test_lib_agw_pybusyinfo.py | 2 +- unittests/test_lib_agw_pycollapsiblepane.py | 2 +- unittests/test_lib_agw_pygauge.py | 2 +- unittests/test_lib_agw_pyprogress.py | 2 +- unittests/test_lib_agw_ribbonbar.py | 2 +- unittests/test_lib_agw_rulerctrl.py | 2 +- unittests/test_lib_agw_shapedbutton.py | 2 +- unittests/test_lib_agw_shortcuteditor.py | 2 +- unittests/test_lib_agw_speedmeter.py | 2 +- unittests/test_lib_agw_supertooltip.py | 2 +- unittests/test_lib_agw_thumbnailctrl.py | 2 +- unittests/test_lib_agw_toasterbox.py | 2 +- unittests/test_lib_agw_ultimatelistctrl.py | 2 +- unittests/test_lib_agw_xlsgrid.py | 2 +- unittests/test_lib_agw_zoombar.py | 2 +- unittests/test_lib_busy.py | 2 +- unittests/test_lib_buttons.py | 2 +- unittests/test_lib_calendar.py | 2 +- unittests/test_lib_cdate.py | 2 +- unittests/test_lib_colourdb.py | 2 +- unittests/test_lib_colourselect.py | 2 +- unittests/test_lib_expando.py | 2 +- unittests/test_lib_fancytext.py | 2 +- unittests/test_lib_floatcanvas_bbox.py | 2 +- unittests/test_lib_floatcanvas_floatcanvas.py | 2 +- unittests/test_lib_imagebrowser.py | 2 +- unittests/test_lib_imageutils.py | 2 +- unittests/test_lib_intctrl.py | 2 +- unittests/test_lib_langlistctrl.py | 2 +- unittests/test_lib_masked.py | 2 +- unittests/test_lib_mixins_inspection.py | 2 +- unittests/test_lib_ogl.py | 2 +- unittests/test_lib_pdfviewer_pdfviewer.py | 2 +- unittests/test_lib_pdfviewer_vec2d.py | 2 +- unittests/test_lib_pubsub_api3.py | 2 +- unittests/test_lib_pubsub_defaultlog.py | 2 +- unittests/test_lib_pubsub_except.py | 2 +- unittests/test_lib_pubsub_listener.py | 2 +- unittests/test_lib_pubsub_notify.py | 2 +- unittests/test_lib_pubsub_notify2.py | 2 +- unittests/test_lib_pubsub_notify2_1.py | 2 +- unittests/test_lib_pubsub_notify2_2.py | 2 +- unittests/test_lib_pubsub_notify3.py | 2 +- unittests/test_lib_pubsub_notify4.py | 2 +- unittests/test_lib_pubsub_provider.py | 2 +- unittests/test_lib_pubsub_spec.py | 2 +- unittests/test_lib_pubsub_topic.py | 2 +- unittests/test_lib_pubsub_topicmgr.py | 2 +- unittests/test_lib_resizewidget.py | 2 +- unittests/test_lib_scrolledpanel.py | 2 +- unittests/test_lib_sized_controls.py | 2 +- unittests/test_lib_splitter.py | 2 +- unittests/test_lib_statbmp.py | 2 +- unittests/test_lib_stattext.py | 2 +- unittests/test_lib_throbber.py | 2 +- unittests/test_lib_ticker.py | 2 +- unittests/test_listbook.py | 2 +- unittests/test_listbox.py | 2 +- unittests/test_listctrl.py | 2 +- unittests/test_log.py | 2 +- unittests/test_longlong.py | 2 +- unittests/test_mdi.py | 2 +- unittests/test_mediactrl.py | 2 +- unittests/test_menu.py | 2 +- unittests/test_menuitem.py | 2 +- unittests/test_mimetype.py | 2 +- unittests/test_minifram.py | 2 +- unittests/test_modalhook.py | 2 +- unittests/test_mousemanager.py | 2 +- unittests/test_mousestate.py | 2 +- unittests/test_msgdlg.py | 2 +- unittests/test_notebook.py | 2 +- unittests/test_notifmsg.py | 2 +- unittests/test_odcombo.py | 2 +- unittests/test_overlay.py | 2 +- unittests/test_panel.py | 2 +- unittests/test_pen.py | 2 +- unittests/test_pi_import.py | 2 +- unittests/test_pickers.py | 2 +- unittests/test_platinfo.py | 2 +- unittests/test_popupwin.py | 2 +- unittests/test_position.py | 2 +- unittests/test_power.py | 2 +- unittests/test_preferences.py | 2 +- unittests/test_printdlg.py | 2 +- unittests/test_printfw.py | 2 +- unittests/test_process.py | 2 +- unittests/test_progdlg.py | 2 +- unittests/test_pyevent.py | 2 +- unittests/test_radiobox.py | 2 +- unittests/test_radiobut.py | 2 +- unittests/test_rawbmp.py | 2 +- unittests/test_rearrangectrl.py | 2 +- unittests/test_region.py | 2 +- unittests/test_renderer.py | 2 +- unittests/test_richmsgdlg.py | 2 +- unittests/test_richtextbuffer.py | 2 +- unittests/test_richtextctrl.py | 2 +- unittests/test_richtextformatdlg.py | 2 +- unittests/test_richtexthtml.py | 2 +- unittests/test_richtextprint.py | 2 +- unittests/test_richtextstyledlg.py | 2 +- unittests/test_richtextstyles.py | 2 +- unittests/test_richtextsymboldlg.py | 2 +- unittests/test_richtextxml.py | 2 +- unittests/test_richtooltip.py | 2 +- unittests/test_sashwin.py | 2 +- unittests/test_scrolbar.py | 2 +- unittests/test_scrolwin.py | 2 +- unittests/test_settings.py | 2 +- unittests/test_sizer.py | 2 +- unittests/test_slider.py | 2 +- unittests/test_snglinst.py | 2 +- unittests/test_sound.py | 2 +- unittests/test_spinbutt.py | 2 +- unittests/test_spinctrl.py | 2 +- unittests/test_splash.py | 2 +- unittests/test_splitter.py | 2 +- unittests/test_srchctrl.py | 2 +- unittests/test_statbmp.py | 2 +- unittests/test_statbox.py | 2 +- unittests/test_statline.py | 2 +- unittests/test_stattext.py | 2 +- unittests/test_statusbar.py | 2 +- unittests/test_stc.py | 2 +- unittests/test_stdpaths.py | 2 +- unittests/test_stockgdi.py | 2 +- unittests/test_stopwatch.py | 2 +- unittests/test_stream.py | 2 +- unittests/test_string.py | 2 +- unittests/test_sysopt.py | 2 +- unittests/test_taskbar.py | 2 +- unittests/test_textctrl.py | 2 +- unittests/test_textdlg.py | 2 +- unittests/test_tglbtn.py | 2 +- unittests/test_timectrl.py | 2 +- unittests/test_timer.py | 2 +- unittests/test_tipdlg.py | 2 +- unittests/test_tipwin.py | 2 +- unittests/test_toolbar.py | 2 +- unittests/test_toolbook.py | 2 +- unittests/test_tooltip.py | 2 +- unittests/test_translation.py | 2 +- unittests/test_treebook.py | 2 +- unittests/test_treectrl.py | 2 +- unittests/test_treelist.py | 2 +- unittests/test_uiaction.py | 2 +- unittests/test_utils.py | 2 +- unittests/test_validate.py | 2 +- unittests/test_variant.py | 2 +- unittests/test_vidmode.py | 2 +- unittests/test_virtualOverride.py | 2 +- unittests/test_vlbox.py | 2 +- unittests/test_vscroll.py | 2 +- unittests/test_wacky_ints.py | 2 +- unittests/test_webkit.py | 2 +- unittests/test_webview.py | 2 +- unittests/test_window.py | 2 +- unittests/test_windowid.py | 2 +- unittests/test_windowlist.py | 2 +- unittests/test_wizard.py | 2 +- unittests/test_wrapsizer.py | 2 +- unittests/test_wxdatetime.py | 2 +- unittests/test_xml.py | 2 +- unittests/test_xrc.py | 2 +- unittests/wtc.py | 2 +- 309 files changed, 308 insertions(+), 318 deletions(-) delete mode 100644 unittests/imp_unittest.py diff --git a/bin/make-new-etg-file.py b/bin/make-new-etg-file.py index 69f2923c..b6df7f32 100755 --- a/bin/make-new-etg-file.py +++ b/bin/make-new-etg-file.py @@ -75,7 +75,7 @@ if __name__ == '__main__': # TODO: refactor to just use make-new-unittest-file instead of duplicating it here... unitteststub = """\ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/bin/make-new-unittest-file.py b/bin/make-new-unittest-file.py index 53ead12d..0b071fc6 100755 --- a/bin/make-new-unittest-file.py +++ b/bin/make-new-unittest-file.py @@ -16,7 +16,7 @@ root_dir = os.path.abspath(os.path.join(script_dir, "..")) usage = "usage: %prog [options] name module" unitteststub = """\ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/imp_unittest.py b/unittests/imp_unittest.py deleted file mode 100644 index 0f9bb707..00000000 --- a/unittests/imp_unittest.py +++ /dev/null @@ -1,10 +0,0 @@ -import sys - -if sys.version_info < (2,7): - # The unittest2 package has back-ported most of the new features of the - # unittest module in Python 2.7, you can get it at PyPI. - import unittest2 - sys.modules['unittest'] = unittest2 - -else: - import unittest diff --git a/unittests/runtests.py b/unittests/runtests.py index 38977528..5ee4f77c 100755 --- a/unittests/runtests.py +++ b/unittests/runtests.py @@ -27,7 +27,7 @@ import sys import os import glob import subprocess -import imp_unittest, unittest +import unittest # make sure the phoenix dir is on the path if os.path.dirname(__file__): diff --git a/unittests/test_aboutdlg.py b/unittests/test_aboutdlg.py index 1e2ed5aa..5c361b52 100644 --- a/unittests/test_aboutdlg.py +++ b/unittests/test_aboutdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_accel.py b/unittests/test_accel.py index 171fb41e..6aa43e87 100644 --- a/unittests/test_accel.py +++ b/unittests/test_accel.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_affinematrix2d.py b/unittests/test_affinematrix2d.py index 99ef3948..ba6c297b 100644 --- a/unittests/test_affinematrix2d.py +++ b/unittests/test_affinematrix2d.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_animate.py b/unittests/test_animate.py index 47892066..23234d65 100644 --- a/unittests/test_animate.py +++ b/unittests/test_animate.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_app.py b/unittests/test_app.py index 602c18b0..981a6886 100644 --- a/unittests/test_app.py +++ b/unittests/test_app.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx ##import os; print 'PID:', os.getpid(); raw_input('Ready to start, press enter...') diff --git a/unittests/test_apptrait.py b/unittests/test_apptrait.py index 1310c5d9..e605b0bb 100644 --- a/unittests/test_apptrait.py +++ b/unittests/test_apptrait.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_arrayint.py b/unittests/test_arrayint.py index f8c0479f..5201cb83 100644 --- a/unittests/test_arrayint.py +++ b/unittests/test_arrayint.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx diff --git a/unittests/test_arraystring.py b/unittests/test_arraystring.py index 9ab14a2e..e1bd891a 100644 --- a/unittests/test_arraystring.py +++ b/unittests/test_arraystring.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import wtc import sys diff --git a/unittests/test_artprov.py b/unittests/test_artprov.py index 0d481915..a35a8d46 100644 --- a/unittests/test_artprov.py +++ b/unittests/test_artprov.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_asserts.py b/unittests/test_asserts.py index 51728cde..9f017323 100644 --- a/unittests/test_asserts.py +++ b/unittests/test_asserts.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_bannerwindow.py b/unittests/test_bannerwindow.py index bef22524..a7df9340 100644 --- a/unittests/test_bannerwindow.py +++ b/unittests/test_bannerwindow.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_bitmap.py b/unittests/test_bitmap.py index 0bc5cb59..52693118 100644 --- a/unittests/test_bitmap.py +++ b/unittests/test_bitmap.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_bmpbuttn.py b/unittests/test_bmpbuttn.py index 247e2bd8..e1023050 100644 --- a/unittests/test_bmpbuttn.py +++ b/unittests/test_bmpbuttn.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_bmpcbox.py b/unittests/test_bmpcbox.py index 0799ae66..6c67adde 100644 --- a/unittests/test_bmpcbox.py +++ b/unittests/test_bmpcbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_bookctrl.py b/unittests/test_bookctrl.py index 08fd3c07..3029b203 100644 --- a/unittests/test_bookctrl.py +++ b/unittests/test_bookctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_brush.py b/unittests/test_brush.py index 1ee827f0..79666c68 100644 --- a/unittests/test_brush.py +++ b/unittests/test_brush.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_busyinfo.py b/unittests/test_busyinfo.py index f20e6c57..3fcd5552 100644 --- a/unittests/test_busyinfo.py +++ b/unittests/test_busyinfo.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_button.py b/unittests/test_button.py index 5b95cdb7..4895e9e6 100644 --- a/unittests/test_button.py +++ b/unittests/test_button.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_calctrl.py b/unittests/test_calctrl.py index b105bad3..2536a9e9 100644 --- a/unittests/test_calctrl.py +++ b/unittests/test_calctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_caret.py b/unittests/test_caret.py index bb711308..0239c43b 100644 --- a/unittests/test_caret.py +++ b/unittests/test_caret.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_checkbox.py b/unittests/test_checkbox.py index 7e5be411..96b2f1c4 100644 --- a/unittests/test_checkbox.py +++ b/unittests/test_checkbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_checklst.py b/unittests/test_checklst.py index ef2554ea..2bc153a9 100644 --- a/unittests/test_checklst.py +++ b/unittests/test_checklst.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_choicdlg.py b/unittests/test_choicdlg.py index 08e55c06..8e832efa 100644 --- a/unittests/test_choicdlg.py +++ b/unittests/test_choicdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_choice.py b/unittests/test_choice.py index aeaf42db..15bec95a 100644 --- a/unittests/test_choice.py +++ b/unittests/test_choice.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_choicebk.py b/unittests/test_choicebk.py index 10b004e0..68cafff3 100644 --- a/unittests/test_choicebk.py +++ b/unittests/test_choicebk.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_clipbrd.py b/unittests/test_clipbrd.py index 83d41315..032a3850 100644 --- a/unittests/test_clipbrd.py +++ b/unittests/test_clipbrd.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_clntdatactnr.py b/unittests/test_clntdatactnr.py index 722d2104..0b087b27 100644 --- a/unittests/test_clntdatactnr.py +++ b/unittests/test_clntdatactnr.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_cmdproc.py b/unittests/test_cmdproc.py index 67b5043e..bebbbaa2 100644 --- a/unittests/test_cmdproc.py +++ b/unittests/test_cmdproc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_cmndata.py b/unittests/test_cmndata.py index b25e592e..9ce2d8c7 100644 --- a/unittests/test_cmndata.py +++ b/unittests/test_cmndata.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.six as six diff --git a/unittests/test_collpane.py b/unittests/test_collpane.py index d71618e2..1ad09e9c 100644 --- a/unittests/test_collpane.py +++ b/unittests/test_collpane.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_colordlg.py b/unittests/test_colordlg.py index 6d1ab994..97a4b58d 100644 --- a/unittests/test_colordlg.py +++ b/unittests/test_colordlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_colour.py b/unittests/test_colour.py index 6db98049..a89c91fa 100644 --- a/unittests/test_colour.py +++ b/unittests/test_colour.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import wtc diff --git a/unittests/test_combo.py b/unittests/test_combo.py index 2e928a4e..423834d6 100644 --- a/unittests/test_combo.py +++ b/unittests/test_combo.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_combobox.py b/unittests/test_combobox.py index 632ad9f4..b1963be5 100644 --- a/unittests/test_combobox.py +++ b/unittests/test_combobox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_commandlinkbutton.py b/unittests/test_commandlinkbutton.py index 0e84be43..57f134b9 100644 --- a/unittests/test_commandlinkbutton.py +++ b/unittests/test_commandlinkbutton.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx, wx.adv diff --git a/unittests/test_config.py b/unittests/test_config.py index a5ebe8e0..0454b57b 100644 --- a/unittests/test_config.py +++ b/unittests/test_config.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_control.py b/unittests/test_control.py index f6c558d6..b290c410 100644 --- a/unittests/test_control.py +++ b/unittests/test_control.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_cshelp.py b/unittests/test_cshelp.py index 1e037d3d..c6fc0f75 100644 --- a/unittests/test_cshelp.py +++ b/unittests/test_cshelp.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_cursor.py b/unittests/test_cursor.py index d78f7af6..5aa4184e 100644 --- a/unittests/test_cursor.py +++ b/unittests/test_cursor.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.six as six diff --git a/unittests/test_dataobj.py b/unittests/test_dataobj.py index cc9de181..5bb5f269 100644 --- a/unittests/test_dataobj.py +++ b/unittests/test_dataobj.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_dataview.py b/unittests/test_dataview.py index 25a82c08..453176d6 100644 --- a/unittests/test_dataview.py +++ b/unittests/test_dataview.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx from wx.lib import six diff --git a/unittests/test_datectrl.py b/unittests/test_datectrl.py index e3518a27..b758ddfb 100644 --- a/unittests/test_datectrl.py +++ b/unittests/test_datectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_dateevt.py b/unittests/test_dateevt.py index f04d4bad..cdf5e381 100644 --- a/unittests/test_dateevt.py +++ b/unittests/test_dateevt.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_dc.py b/unittests/test_dc.py index 09434875..7445aa7d 100644 --- a/unittests/test_dc.py +++ b/unittests/test_dc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_dcDrawLists.py b/unittests/test_dcDrawLists.py index f72721a0..b35aa457 100644 --- a/unittests/test_dcDrawLists.py +++ b/unittests/test_dcDrawLists.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import random diff --git a/unittests/test_dcbuffer.py b/unittests/test_dcbuffer.py index 34026a84..1464e700 100644 --- a/unittests/test_dcbuffer.py +++ b/unittests/test_dcbuffer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcclient.py b/unittests/test_dcclient.py index d5da9d6e..bb3c356d 100644 --- a/unittests/test_dcclient.py +++ b/unittests/test_dcclient.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcgraph.py b/unittests/test_dcgraph.py index e6479f17..e5c778d4 100644 --- a/unittests/test_dcgraph.py +++ b/unittests/test_dcgraph.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcmemory.py b/unittests/test_dcmemory.py index 06ba5a87..dd19a11e 100644 --- a/unittests/test_dcmemory.py +++ b/unittests/test_dcmemory.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcmirror.py b/unittests/test_dcmirror.py index bd5a0df6..bb988908 100644 --- a/unittests/test_dcmirror.py +++ b/unittests/test_dcmirror.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcprint.py b/unittests/test_dcprint.py index c138600d..582dd655 100644 --- a/unittests/test_dcprint.py +++ b/unittests/test_dcprint.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcps.py b/unittests/test_dcps.py index a6b56d7e..db7ae926 100644 --- a/unittests/test_dcps.py +++ b/unittests/test_dcps.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcscreen.py b/unittests/test_dcscreen.py index bc354825..e5831c49 100644 --- a/unittests/test_dcscreen.py +++ b/unittests/test_dcscreen.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_dcsvg.py b/unittests/test_dcsvg.py index afb04ee4..8a7b7ee5 100644 --- a/unittests/test_dcsvg.py +++ b/unittests/test_dcsvg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_deadobj.py b/unittests/test_deadobj.py index 99246b5b..d3fa3250 100644 --- a/unittests/test_deadobj.py +++ b/unittests/test_deadobj.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_debug.py b/unittests/test_debug.py index 4c06b5e4..81416ad9 100644 --- a/unittests/test_debug.py +++ b/unittests/test_debug.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_defs.py b/unittests/test_defs.py index ad51c24f..d92088a8 100644 --- a/unittests/test_defs.py +++ b/unittests/test_defs.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_dialog.py b/unittests/test_dialog.py index 24551724..c21059b5 100644 --- a/unittests/test_dialog.py +++ b/unittests/test_dialog.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_dirctrl.py b/unittests/test_dirctrl.py index 5a8ff11d..3d687f82 100644 --- a/unittests/test_dirctrl.py +++ b/unittests/test_dirctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_dirdlg.py b/unittests/test_dirdlg.py index 4a0a2635..fee8f8a9 100644 --- a/unittests/test_dirdlg.py +++ b/unittests/test_dirdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_display.py b/unittests/test_display.py index fbb946af..ae1a56da 100644 --- a/unittests/test_display.py +++ b/unittests/test_display.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx #import os; print(os.getpid()) diff --git a/unittests/test_dnd.py b/unittests/test_dnd.py index 08e2df06..f126b2f2 100644 --- a/unittests/test_dnd.py +++ b/unittests/test_dnd.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_dragimag.py b/unittests/test_dragimag.py index b451b675..687ded8a 100644 --- a/unittests/test_dragimag.py +++ b/unittests/test_dragimag.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_editlbox.py b/unittests/test_editlbox.py index 8ec9d894..58221d63 100644 --- a/unittests/test_editlbox.py +++ b/unittests/test_editlbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_event.py b/unittests/test_event.py index 3be72ba5..20b3ec3b 100644 --- a/unittests/test_event.py +++ b/unittests/test_event.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx diff --git a/unittests/test_fdrepdlg.py b/unittests/test_fdrepdlg.py index 900dac25..9d84e93d 100644 --- a/unittests/test_fdrepdlg.py +++ b/unittests/test_fdrepdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_filectrl.py b/unittests/test_filectrl.py index 1e33324c..f46700b1 100644 --- a/unittests/test_filectrl.py +++ b/unittests/test_filectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_filedlg.py b/unittests/test_filedlg.py index 23a2f2f4..4817888e 100644 --- a/unittests/test_filedlg.py +++ b/unittests/test_filedlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_filehistory.py b/unittests/test_filehistory.py index 0e2fe568..c89c5d48 100644 --- a/unittests/test_filehistory.py +++ b/unittests/test_filehistory.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_filesys.py b/unittests/test_filesys.py index 72689865..3dd6c109 100644 --- a/unittests/test_filesys.py +++ b/unittests/test_filesys.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_font.py b/unittests/test_font.py index fa9d227d..08832c3d 100644 --- a/unittests/test_font.py +++ b/unittests/test_font.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_fontdlg.py b/unittests/test_fontdlg.py index beba3b6d..0cdfaeb4 100644 --- a/unittests/test_fontdlg.py +++ b/unittests/test_fontdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_fontenum.py b/unittests/test_fontenum.py index 6e0fb754..cfd16b32 100644 --- a/unittests/test_fontenum.py +++ b/unittests/test_fontenum.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_fontmap.py b/unittests/test_fontmap.py index 57eb59dd..a5c96443 100644 --- a/unittests/test_fontmap.py +++ b/unittests/test_fontmap.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_fontutil.py b/unittests/test_fontutil.py index 1b3a00c5..3f706468 100644 --- a/unittests/test_fontutil.py +++ b/unittests/test_fontutil.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_frame.py b/unittests/test_frame.py index c7abe50a..430a5f22 100644 --- a/unittests/test_frame.py +++ b/unittests/test_frame.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_fswatcher.py b/unittests/test_fswatcher.py index d6d5e4c5..7cd987b5 100644 --- a/unittests/test_fswatcher.py +++ b/unittests/test_fswatcher.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_gauge.py b/unittests/test_gauge.py index 41393eed..cf8e88b4 100644 --- a/unittests/test_gauge.py +++ b/unittests/test_gauge.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_gbsizer.py b/unittests/test_gbsizer.py index 983cfb42..3f50eb99 100644 --- a/unittests/test_gbsizer.py +++ b/unittests/test_gbsizer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_gdicmn.py b/unittests/test_gdicmn.py index 867d88c0..16774ed9 100644 --- a/unittests/test_gdicmn.py +++ b/unittests/test_gdicmn.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_geometry.py b/unittests/test_geometry.py index 42c083fa..9086a7a6 100644 --- a/unittests/test_geometry.py +++ b/unittests/test_geometry.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx diff --git a/unittests/test_glcanvas.py b/unittests/test_glcanvas.py index 54152d85..6bb40c86 100644 --- a/unittests/test_glcanvas.py +++ b/unittests/test_glcanvas.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.glcanvas diff --git a/unittests/test_graphics.py b/unittests/test_graphics.py index df271e39..1766808e 100644 --- a/unittests/test_graphics.py +++ b/unittests/test_graphics.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_grid.py b/unittests/test_grid.py index f3990b65..b42f3521 100644 --- a/unittests/test_grid.py +++ b/unittests/test_grid.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.grid diff --git a/unittests/test_headercol.py b/unittests/test_headercol.py index ba04727d..127fe571 100644 --- a/unittests/test_headercol.py +++ b/unittests/test_headercol.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_headerctrl.py b/unittests/test_headerctrl.py index 38c8c4fd..fa1e4166 100644 --- a/unittests/test_headerctrl.py +++ b/unittests/test_headerctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_help.py b/unittests/test_help.py index 909bc561..b2d6e7e4 100644 --- a/unittests/test_help.py +++ b/unittests/test_help.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_helpctrl.py b/unittests/test_helpctrl.py index 9b31eb09..20399ed8 100644 --- a/unittests/test_helpctrl.py +++ b/unittests/test_helpctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_helpdata.py b/unittests/test_helpdata.py index b882f2c8..a5f611b6 100644 --- a/unittests/test_helpdata.py +++ b/unittests/test_helpdata.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_helpdlg.py b/unittests/test_helpdlg.py index 59c6571d..9ea02f38 100644 --- a/unittests/test_helpdlg.py +++ b/unittests/test_helpdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_helpext.py b/unittests/test_helpext.py index ae7359bc..48c60435 100644 --- a/unittests/test_helpext.py +++ b/unittests/test_helpext.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_helpfrm.py b/unittests/test_helpfrm.py index 1f1529ca..46d43f24 100644 --- a/unittests/test_helpfrm.py +++ b/unittests/test_helpfrm.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_helpwnd.py b/unittests/test_helpwnd.py index a733dcee..c3a2d1d5 100644 --- a/unittests/test_helpwnd.py +++ b/unittests/test_helpwnd.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmlcell.py b/unittests/test_htmlcell.py index 24b38839..292f8bed 100644 --- a/unittests/test_htmlcell.py +++ b/unittests/test_htmlcell.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmldefs.py b/unittests/test_htmldefs.py index 659a290f..41d32665 100644 --- a/unittests/test_htmldefs.py +++ b/unittests/test_htmldefs.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmllbox.py b/unittests/test_htmllbox.py index 144868b7..98e5b756 100644 --- a/unittests/test_htmllbox.py +++ b/unittests/test_htmllbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmlpars.py b/unittests/test_htmlpars.py index c87ff2fc..4c3010df 100644 --- a/unittests/test_htmlpars.py +++ b/unittests/test_htmlpars.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmlprint.py b/unittests/test_htmlprint.py index 8e46985e..7d7716fc 100644 --- a/unittests/test_htmlprint.py +++ b/unittests/test_htmlprint.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmlwin.py b/unittests/test_htmlwin.py index c58da3bf..ff72fc37 100644 --- a/unittests/test_htmlwin.py +++ b/unittests/test_htmlwin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_htmlwinpars.py b/unittests/test_htmlwinpars.py index 2ca827ee..37759da6 100644 --- a/unittests/test_htmlwinpars.py +++ b/unittests/test_htmlwinpars.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html diff --git a/unittests/test_hyperlink.py b/unittests/test_hyperlink.py index b482f1df..de82bb6f 100644 --- a/unittests/test_hyperlink.py +++ b/unittests/test_hyperlink.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_icon.py b/unittests/test_icon.py index 980dee50..25d94efc 100644 --- a/unittests/test_icon.py +++ b/unittests/test_icon.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_iconbndl.py b/unittests/test_iconbndl.py index ae87e36f..ce924616 100644 --- a/unittests/test_iconbndl.py +++ b/unittests/test_iconbndl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_iconloc.py b/unittests/test_iconloc.py index a641d1a2..9f262d27 100644 --- a/unittests/test_iconloc.py +++ b/unittests/test_iconloc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_image.py b/unittests/test_image.py index eb9bc49d..3e6710ff 100644 --- a/unittests/test_image.py +++ b/unittests/test_image.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.six as six diff --git a/unittests/test_imaglist.py b/unittests/test_imaglist.py index 104af83d..76cb0d24 100644 --- a/unittests/test_imaglist.py +++ b/unittests/test_imaglist.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_infobar.py b/unittests/test_infobar.py index 070bba5a..31b7e633 100644 --- a/unittests/test_infobar.py +++ b/unittests/test_infobar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_intl.py b/unittests/test_intl.py index 591e460c..03aa57f4 100644 --- a/unittests/test_intl.py +++ b/unittests/test_intl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_joystick.py b/unittests/test_joystick.py index 55bf6bf4..12827bf7 100644 --- a/unittests/test_joystick.py +++ b/unittests/test_joystick.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_kbdstate.py b/unittests/test_kbdstate.py index 10bf90e7..f0a27b04 100644 --- a/unittests/test_kbdstate.py +++ b/unittests/test_kbdstate.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx diff --git a/unittests/test_layout.py b/unittests/test_layout.py index 28f71eeb..13eaf4be 100644 --- a/unittests/test_layout.py +++ b/unittests/test_layout.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_laywin.py b/unittests/test_laywin.py index 5cab1d55..6bb94fbf 100644 --- a/unittests/test_laywin.py +++ b/unittests/test_laywin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_lib_agw_advancedsplash.py b/unittests/test_lib_agw_advancedsplash.py index ed45c00f..01fbac84 100644 --- a/unittests/test_lib_agw_advancedsplash.py +++ b/unittests/test_lib_agw_advancedsplash.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_aquabutton.py b/unittests/test_lib_agw_aquabutton.py index b8612e04..95ff83cd 100644 --- a/unittests/test_lib_agw_aquabutton.py +++ b/unittests/test_lib_agw_aquabutton.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_aui.py b/unittests/test_lib_agw_aui.py index 76140f51..431b8fb8 100644 --- a/unittests/test_lib_agw_aui.py +++ b/unittests/test_lib_agw_aui.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_aui_dockart.py b/unittests/test_lib_agw_aui_dockart.py index d31c32b9..33ef12a2 100644 --- a/unittests/test_lib_agw_aui_dockart.py +++ b/unittests/test_lib_agw_aui_dockart.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_aui_tabart.py b/unittests/test_lib_agw_aui_tabart.py index b299bf84..687bd418 100644 --- a/unittests/test_lib_agw_aui_tabart.py +++ b/unittests/test_lib_agw_aui_tabart.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_aui_utilities.py b/unittests/test_lib_agw_aui_utilities.py index 058732e7..17a30ee3 100644 --- a/unittests/test_lib_agw_aui_utilities.py +++ b/unittests/test_lib_agw_aui_utilities.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_balloontip.py b/unittests/test_lib_agw_balloontip.py index 1a5b42b6..dd4e5a64 100644 --- a/unittests/test_lib_agw_balloontip.py +++ b/unittests/test_lib_agw_balloontip.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_buttonpanel.py b/unittests/test_lib_agw_buttonpanel.py index 38657ae9..3cf258bd 100644 --- a/unittests/test_lib_agw_buttonpanel.py +++ b/unittests/test_lib_agw_buttonpanel.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_cubecolourdialog.py b/unittests/test_lib_agw_cubecolourdialog.py index 520b24bf..77e5769a 100644 --- a/unittests/test_lib_agw_cubecolourdialog.py +++ b/unittests/test_lib_agw_cubecolourdialog.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_customtreectrl.py b/unittests/test_lib_agw_customtreectrl.py index 22e8e779..aa346ae7 100644 --- a/unittests/test_lib_agw_customtreectrl.py +++ b/unittests/test_lib_agw_customtreectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import sys import wtc import wx diff --git a/unittests/test_lib_agw_flatmenu.py b/unittests/test_lib_agw_flatmenu.py index bca31ad4..6d285895 100644 --- a/unittests/test_lib_agw_flatmenu.py +++ b/unittests/test_lib_agw_flatmenu.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_flatnotebook.py b/unittests/test_lib_agw_flatnotebook.py index 886c2cc1..772a82f2 100644 --- a/unittests/test_lib_agw_flatnotebook.py +++ b/unittests/test_lib_agw_flatnotebook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_floatspin.py b/unittests/test_lib_agw_floatspin.py index 886429cf..beb19b3e 100644 --- a/unittests/test_lib_agw_floatspin.py +++ b/unittests/test_lib_agw_floatspin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_fmcustomizedlg.py b/unittests/test_lib_agw_fmcustomizedlg.py index dfb559c3..4276e500 100644 --- a/unittests/test_lib_agw_fmcustomizedlg.py +++ b/unittests/test_lib_agw_fmcustomizedlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_foldpanelbar.py b/unittests/test_lib_agw_foldpanelbar.py index 959bf83d..e4361de1 100644 --- a/unittests/test_lib_agw_foldpanelbar.py +++ b/unittests/test_lib_agw_foldpanelbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_fourwaysplitter.py b/unittests/test_lib_agw_fourwaysplitter.py index c9be0a01..90162a6c 100644 --- a/unittests/test_lib_agw_fourwaysplitter.py +++ b/unittests/test_lib_agw_fourwaysplitter.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_genericmessagedialog.py b/unittests/test_lib_agw_genericmessagedialog.py index 7bb8a64b..f6179ec8 100644 --- a/unittests/test_lib_agw_genericmessagedialog.py +++ b/unittests/test_lib_agw_genericmessagedialog.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_gradientbutton.py b/unittests/test_lib_agw_gradientbutton.py index 36f56c77..826f6f48 100644 --- a/unittests/test_lib_agw_gradientbutton.py +++ b/unittests/test_lib_agw_gradientbutton.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_hyperlink.py b/unittests/test_lib_agw_hyperlink.py index 77f0c16b..7f94c6b5 100644 --- a/unittests/test_lib_agw_hyperlink.py +++ b/unittests/test_lib_agw_hyperlink.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_hypertreelist.py b/unittests/test_lib_agw_hypertreelist.py index 7d82a7e8..b3cec52f 100644 --- a/unittests/test_lib_agw_hypertreelist.py +++ b/unittests/test_lib_agw_hypertreelist.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_infobar.py b/unittests/test_lib_agw_infobar.py index 28d9890d..51df8676 100644 --- a/unittests/test_lib_agw_infobar.py +++ b/unittests/test_lib_agw_infobar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_knobctrl.py b/unittests/test_lib_agw_knobctrl.py index 7c545b0c..109c3a29 100644 --- a/unittests/test_lib_agw_knobctrl.py +++ b/unittests/test_lib_agw_knobctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_labelbook.py b/unittests/test_lib_agw_labelbook.py index 8c5e5646..31b5cb75 100644 --- a/unittests/test_lib_agw_labelbook.py +++ b/unittests/test_lib_agw_labelbook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_multidirdialog.py b/unittests/test_lib_agw_multidirdialog.py index e0ef25c7..f6dd5291 100644 --- a/unittests/test_lib_agw_multidirdialog.py +++ b/unittests/test_lib_agw_multidirdialog.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_peakmeter.py b/unittests/test_lib_agw_peakmeter.py index d41dd5e8..48c9f988 100644 --- a/unittests/test_lib_agw_peakmeter.py +++ b/unittests/test_lib_agw_peakmeter.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import random diff --git a/unittests/test_lib_agw_persist_persistencemanager.py b/unittests/test_lib_agw_persist_persistencemanager.py index 46915bde..1c4c0f68 100644 --- a/unittests/test_lib_agw_persist_persistencemanager.py +++ b/unittests/test_lib_agw_persist_persistencemanager.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import random diff --git a/unittests/test_lib_agw_piectrl.py b/unittests/test_lib_agw_piectrl.py index 9509372f..e1aaa197 100644 --- a/unittests/test_lib_agw_piectrl.py +++ b/unittests/test_lib_agw_piectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_pybusyinfo.py b/unittests/test_lib_agw_pybusyinfo.py index 56921d66..a1f0f8d7 100644 --- a/unittests/test_lib_agw_pybusyinfo.py +++ b/unittests/test_lib_agw_pybusyinfo.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_pycollapsiblepane.py b/unittests/test_lib_agw_pycollapsiblepane.py index 7db67c79..2389712c 100644 --- a/unittests/test_lib_agw_pycollapsiblepane.py +++ b/unittests/test_lib_agw_pycollapsiblepane.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_pygauge.py b/unittests/test_lib_agw_pygauge.py index 5d0f4bd8..57ce0385 100644 --- a/unittests/test_lib_agw_pygauge.py +++ b/unittests/test_lib_agw_pygauge.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_pyprogress.py b/unittests/test_lib_agw_pyprogress.py index 7dd3a0ed..596348b7 100644 --- a/unittests/test_lib_agw_pyprogress.py +++ b/unittests/test_lib_agw_pyprogress.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_ribbonbar.py b/unittests/test_lib_agw_ribbonbar.py index 854da1c5..bdb65b74 100644 --- a/unittests/test_lib_agw_ribbonbar.py +++ b/unittests/test_lib_agw_ribbonbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_rulerctrl.py b/unittests/test_lib_agw_rulerctrl.py index 90dd857c..e1312c14 100644 --- a/unittests/test_lib_agw_rulerctrl.py +++ b/unittests/test_lib_agw_rulerctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_shapedbutton.py b/unittests/test_lib_agw_shapedbutton.py index b6aafc85..d1b5a7e3 100644 --- a/unittests/test_lib_agw_shapedbutton.py +++ b/unittests/test_lib_agw_shapedbutton.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_shortcuteditor.py b/unittests/test_lib_agw_shortcuteditor.py index 7db2ecef..a224b015 100644 --- a/unittests/test_lib_agw_shortcuteditor.py +++ b/unittests/test_lib_agw_shortcuteditor.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_agw_speedmeter.py b/unittests/test_lib_agw_speedmeter.py index 944b907d..7884ac63 100644 --- a/unittests/test_lib_agw_speedmeter.py +++ b/unittests/test_lib_agw_speedmeter.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import random diff --git a/unittests/test_lib_agw_supertooltip.py b/unittests/test_lib_agw_supertooltip.py index 6995d44b..cbdc23cf 100644 --- a/unittests/test_lib_agw_supertooltip.py +++ b/unittests/test_lib_agw_supertooltip.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_thumbnailctrl.py b/unittests/test_lib_agw_thumbnailctrl.py index 2abdf296..a1c20277 100644 --- a/unittests/test_lib_agw_thumbnailctrl.py +++ b/unittests/test_lib_agw_thumbnailctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_toasterbox.py b/unittests/test_lib_agw_toasterbox.py index d842ba12..a5b687aa 100644 --- a/unittests/test_lib_agw_toasterbox.py +++ b/unittests/test_lib_agw_toasterbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_ultimatelistctrl.py b/unittests/test_lib_agw_ultimatelistctrl.py index 5448bf2b..be4443f1 100644 --- a/unittests/test_lib_agw_ultimatelistctrl.py +++ b/unittests/test_lib_agw_ultimatelistctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_xlsgrid.py b/unittests/test_lib_agw_xlsgrid.py index 728041fb..bfd94a73 100644 --- a/unittests/test_lib_agw_xlsgrid.py +++ b/unittests/test_lib_agw_xlsgrid.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_agw_zoombar.py b/unittests/test_lib_agw_zoombar.py index f9c68852..59bb4354 100644 --- a/unittests/test_lib_agw_zoombar.py +++ b/unittests/test_lib_agw_zoombar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_busy.py b/unittests/test_lib_busy.py index e2c9b873..22e5e048 100644 --- a/unittests/test_lib_busy.py +++ b/unittests/test_lib_busy.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_buttons.py b/unittests/test_lib_buttons.py index 7553915e..a692ab4e 100644 --- a/unittests/test_lib_buttons.py +++ b/unittests/test_lib_buttons.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_calendar.py b/unittests/test_lib_calendar.py index e99ee343..37382fdb 100644 --- a/unittests/test_lib_calendar.py +++ b/unittests/test_lib_calendar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.calendar as cal diff --git a/unittests/test_lib_cdate.py b/unittests/test_lib_cdate.py index 52a778e4..e7022994 100644 --- a/unittests/test_lib_cdate.py +++ b/unittests/test_lib_cdate.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx.lib.CDate as cdate import wx.lib.six as six diff --git a/unittests/test_lib_colourdb.py b/unittests/test_lib_colourdb.py index 3fc0c980..5deae3ba 100644 --- a/unittests/test_lib_colourdb.py +++ b/unittests/test_lib_colourdb.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.colourdb diff --git a/unittests/test_lib_colourselect.py b/unittests/test_lib_colourselect.py index 2773644a..5ff709fb 100644 --- a/unittests/test_lib_colourselect.py +++ b/unittests/test_lib_colourselect.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.colourselect diff --git a/unittests/test_lib_expando.py b/unittests/test_lib_expando.py index 3a1c0e6f..cfdc9848 100644 --- a/unittests/test_lib_expando.py +++ b/unittests/test_lib_expando.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.expando diff --git a/unittests/test_lib_fancytext.py b/unittests/test_lib_fancytext.py index 3f38521f..1137848a 100644 --- a/unittests/test_lib_fancytext.py +++ b/unittests/test_lib_fancytext.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_floatcanvas_bbox.py b/unittests/test_lib_floatcanvas_bbox.py index ea6e6b95..1acf598d 100644 --- a/unittests/test_lib_floatcanvas_bbox.py +++ b/unittests/test_lib_floatcanvas_bbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_floatcanvas_floatcanvas.py b/unittests/test_lib_floatcanvas_floatcanvas.py index a7a1b814..ef92de72 100644 --- a/unittests/test_lib_floatcanvas_floatcanvas.py +++ b/unittests/test_lib_floatcanvas_floatcanvas.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_imagebrowser.py b/unittests/test_lib_imagebrowser.py index 49fcc0f1..23e3da8e 100644 --- a/unittests/test_lib_imagebrowser.py +++ b/unittests/test_lib_imagebrowser.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.imagebrowser as ib diff --git a/unittests/test_lib_imageutils.py b/unittests/test_lib_imageutils.py index 474739c6..8ef6239d 100644 --- a/unittests/test_lib_imageutils.py +++ b/unittests/test_lib_imageutils.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.imageutils diff --git a/unittests/test_lib_intctrl.py b/unittests/test_lib_intctrl.py index bb13780a..65de5c7a 100644 --- a/unittests/test_lib_intctrl.py +++ b/unittests/test_lib_intctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.intctrl as IC diff --git a/unittests/test_lib_langlistctrl.py b/unittests/test_lib_langlistctrl.py index 3e01421d..85f1a2b1 100644 --- a/unittests/test_lib_langlistctrl.py +++ b/unittests/test_lib_langlistctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.langlistctrl as lc diff --git a/unittests/test_lib_masked.py b/unittests/test_lib_masked.py index dcc3ce88..d1f9076d 100644 --- a/unittests/test_lib_masked.py +++ b/unittests/test_lib_masked.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.masked as m diff --git a/unittests/test_lib_mixins_inspection.py b/unittests/test_lib_mixins_inspection.py index 404b8c78..f2965d4f 100644 --- a/unittests/test_lib_mixins_inspection.py +++ b/unittests/test_lib_mixins_inspection.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import wx.lib.mixins.inspection as wit diff --git a/unittests/test_lib_ogl.py b/unittests/test_lib_ogl.py index 3820034f..1c97f9ad 100644 --- a/unittests/test_lib_ogl.py +++ b/unittests/test_lib_ogl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_lib_pdfviewer_pdfviewer.py b/unittests/test_lib_pdfviewer_pdfviewer.py index acda086f..41368d31 100644 --- a/unittests/test_lib_pdfviewer_pdfviewer.py +++ b/unittests/test_lib_pdfviewer_pdfviewer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_pdfviewer_vec2d.py b/unittests/test_lib_pdfviewer_vec2d.py index 162eed9a..a467ac45 100644 --- a/unittests/test_lib_pdfviewer_vec2d.py +++ b/unittests/test_lib_pdfviewer_vec2d.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import pickle diff --git a/unittests/test_lib_pubsub_api3.py b/unittests/test_lib_pubsub_api3.py index 5837053d..513fda8b 100644 --- a/unittests/test_lib_pubsub_api3.py +++ b/unittests/test_lib_pubsub_api3.py @@ -8,7 +8,7 @@ disabled, as it is more rigorous for testing purposes. """ -import imp_unittest, unittest +import unittest import wtc from wx.lib.pubsub.core import getListenerID diff --git a/unittests/test_lib_pubsub_defaultlog.py b/unittests/test_lib_pubsub_defaultlog.py index 9543bfdb..04eddfd3 100644 --- a/unittests/test_lib_pubsub_defaultlog.py +++ b/unittests/test_lib_pubsub_defaultlog.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from wx.lib.pubsub.utils import notification diff --git a/unittests/test_lib_pubsub_except.py b/unittests/test_lib_pubsub_except.py index e6222f6e..aab9aa2e 100644 --- a/unittests/test_lib_pubsub_except.py +++ b/unittests/test_lib_pubsub_except.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc diff --git a/unittests/test_lib_pubsub_listener.py b/unittests/test_lib_pubsub_listener.py index 0b777755..3a6ab794 100644 --- a/unittests/test_lib_pubsub_listener.py +++ b/unittests/test_lib_pubsub_listener.py @@ -5,7 +5,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from wx.lib.pubsub.core.weakmethod import WeakMethod diff --git a/unittests/test_lib_pubsub_notify.py b/unittests/test_lib_pubsub_notify.py index 8adf9d50..ced06a04 100644 --- a/unittests/test_lib_pubsub_notify.py +++ b/unittests/test_lib_pubsub_notify.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from difflib import ndiff, unified_diff, context_diff diff --git a/unittests/test_lib_pubsub_notify2.py b/unittests/test_lib_pubsub_notify2.py index 7a9edde5..981502fc 100644 --- a/unittests/test_lib_pubsub_notify2.py +++ b/unittests/test_lib_pubsub_notify2.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc diff --git a/unittests/test_lib_pubsub_notify2_1.py b/unittests/test_lib_pubsub_notify2_1.py index ac1e8fd4..a7c1bb39 100644 --- a/unittests/test_lib_pubsub_notify2_1.py +++ b/unittests/test_lib_pubsub_notify2_1.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc diff --git a/unittests/test_lib_pubsub_notify2_2.py b/unittests/test_lib_pubsub_notify2_2.py index fe30933d..d6443fbf 100644 --- a/unittests/test_lib_pubsub_notify2_2.py +++ b/unittests/test_lib_pubsub_notify2_2.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc diff --git a/unittests/test_lib_pubsub_notify3.py b/unittests/test_lib_pubsub_notify3.py index 6367e35a..d299ab1f 100644 --- a/unittests/test_lib_pubsub_notify3.py +++ b/unittests/test_lib_pubsub_notify3.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from difflib import ndiff, unified_diff, context_diff diff --git a/unittests/test_lib_pubsub_notify4.py b/unittests/test_lib_pubsub_notify4.py index 58230ff2..153a762d 100644 --- a/unittests/test_lib_pubsub_notify4.py +++ b/unittests/test_lib_pubsub_notify4.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc import wx.lib.six as six diff --git a/unittests/test_lib_pubsub_provider.py b/unittests/test_lib_pubsub_provider.py index bf0a94c4..ae9ff1b6 100644 --- a/unittests/test_lib_pubsub_provider.py +++ b/unittests/test_lib_pubsub_provider.py @@ -6,7 +6,7 @@ """ import os -import imp_unittest, unittest +import unittest import wtc from textwrap import dedent diff --git a/unittests/test_lib_pubsub_spec.py b/unittests/test_lib_pubsub_spec.py index deebb1d3..27ace3ca 100644 --- a/unittests/test_lib_pubsub_spec.py +++ b/unittests/test_lib_pubsub_spec.py @@ -5,7 +5,7 @@ """ -import imp_unittest, unittest +import unittest import wtc diff --git a/unittests/test_lib_pubsub_topic.py b/unittests/test_lib_pubsub_topic.py index 033d41c7..7c148156 100644 --- a/unittests/test_lib_pubsub_topic.py +++ b/unittests/test_lib_pubsub_topic.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from wx.lib.pubsub.core.topicobj import Topic diff --git a/unittests/test_lib_pubsub_topicmgr.py b/unittests/test_lib_pubsub_topicmgr.py index 54228200..8306400a 100644 --- a/unittests/test_lib_pubsub_topicmgr.py +++ b/unittests/test_lib_pubsub_topicmgr.py @@ -6,7 +6,7 @@ """ -import imp_unittest, unittest +import unittest import wtc from wx.lib.pubsub.pub import ( diff --git a/unittests/test_lib_resizewidget.py b/unittests/test_lib_resizewidget.py index ee0d0b40..dfe4c1c8 100644 --- a/unittests/test_lib_resizewidget.py +++ b/unittests/test_lib_resizewidget.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.resizewidget as RW diff --git a/unittests/test_lib_scrolledpanel.py b/unittests/test_lib_scrolledpanel.py index 6eb19826..db9fc06c 100644 --- a/unittests/test_lib_scrolledpanel.py +++ b/unittests/test_lib_scrolledpanel.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.scrolledpanel diff --git a/unittests/test_lib_sized_controls.py b/unittests/test_lib_sized_controls.py index cea4e4f2..a4bfa595 100644 --- a/unittests/test_lib_sized_controls.py +++ b/unittests/test_lib_sized_controls.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_lib_splitter.py b/unittests/test_lib_splitter.py index d2d17f55..281d76d2 100644 --- a/unittests/test_lib_splitter.py +++ b/unittests/test_lib_splitter.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.splitter as sp diff --git a/unittests/test_lib_statbmp.py b/unittests/test_lib_statbmp.py index 9137a1e9..694b5ffe 100644 --- a/unittests/test_lib_statbmp.py +++ b/unittests/test_lib_statbmp.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.statbmp diff --git a/unittests/test_lib_stattext.py b/unittests/test_lib_stattext.py index b79c124d..2b9e4c91 100644 --- a/unittests/test_lib_stattext.py +++ b/unittests/test_lib_stattext.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.stattext diff --git a/unittests/test_lib_throbber.py b/unittests/test_lib_throbber.py index f799babf..e041b35b 100644 --- a/unittests/test_lib_throbber.py +++ b/unittests/test_lib_throbber.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.throbber as th diff --git a/unittests/test_lib_ticker.py b/unittests/test_lib_ticker.py index 3fa9a95e..d68726c2 100644 --- a/unittests/test_lib_ticker.py +++ b/unittests/test_lib_ticker.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc from wx.lib.ticker import Ticker diff --git a/unittests/test_listbook.py b/unittests/test_listbook.py index 9656fa40..897cdf47 100644 --- a/unittests/test_listbook.py +++ b/unittests/test_listbook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_listbox.py b/unittests/test_listbox.py index 2a45df0e..8682cab7 100644 --- a/unittests/test_listbox.py +++ b/unittests/test_listbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_listctrl.py b/unittests/test_listctrl.py index 8782683c..0294309e 100644 --- a/unittests/test_listctrl.py +++ b/unittests/test_listctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_log.py b/unittests/test_log.py index ed177c3f..da37a501 100644 --- a/unittests/test_log.py +++ b/unittests/test_log.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_longlong.py b/unittests/test_longlong.py index 41ca5c24..05054d7d 100644 --- a/unittests/test_longlong.py +++ b/unittests/test_longlong.py @@ -1,5 +1,5 @@ -import imp_unittest, unittest +import unittest import wx #--------------------------------------------------------------------------- diff --git a/unittests/test_mdi.py b/unittests/test_mdi.py index 4ae759ff..2e43b711 100644 --- a/unittests/test_mdi.py +++ b/unittests/test_mdi.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_mediactrl.py b/unittests/test_mediactrl.py index be371aac..a20a17fa 100644 --- a/unittests/test_mediactrl.py +++ b/unittests/test_mediactrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.media diff --git a/unittests/test_menu.py b/unittests/test_menu.py index e7284491..e1b05ba7 100644 --- a/unittests/test_menu.py +++ b/unittests/test_menu.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_menuitem.py b/unittests/test_menuitem.py index 56f6bb0e..09224d0f 100644 --- a/unittests/test_menuitem.py +++ b/unittests/test_menuitem.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_mimetype.py b/unittests/test_mimetype.py index a4cd13fd..173d866f 100644 --- a/unittests/test_mimetype.py +++ b/unittests/test_mimetype.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_minifram.py b/unittests/test_minifram.py index efc4f357..b24b9417 100644 --- a/unittests/test_minifram.py +++ b/unittests/test_minifram.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_modalhook.py b/unittests/test_modalhook.py index 24c4d84b..85327497 100644 --- a/unittests/test_modalhook.py +++ b/unittests/test_modalhook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_mousemanager.py b/unittests/test_mousemanager.py index d3ab9874..be098bd9 100644 --- a/unittests/test_mousemanager.py +++ b/unittests/test_mousemanager.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_mousestate.py b/unittests/test_mousestate.py index 11c7e60c..d177c1a7 100644 --- a/unittests/test_mousestate.py +++ b/unittests/test_mousestate.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx #--------------------------------------------------------------------------- diff --git a/unittests/test_msgdlg.py b/unittests/test_msgdlg.py index 55557ed2..4125add4 100644 --- a/unittests/test_msgdlg.py +++ b/unittests/test_msgdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_notebook.py b/unittests/test_notebook.py index 3c8b43e6..f3d87297 100644 --- a/unittests/test_notebook.py +++ b/unittests/test_notebook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_notifmsg.py b/unittests/test_notifmsg.py index b0d9e3fb..b4f63f93 100644 --- a/unittests/test_notifmsg.py +++ b/unittests/test_notifmsg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_odcombo.py b/unittests/test_odcombo.py index 2d012cea..b6fd2540 100644 --- a/unittests/test_odcombo.py +++ b/unittests/test_odcombo.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_overlay.py b/unittests/test_overlay.py index a886b5d2..b05f93f2 100644 --- a/unittests/test_overlay.py +++ b/unittests/test_overlay.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_panel.py b/unittests/test_panel.py index 9cd70a77..b00bdf4e 100644 --- a/unittests/test_panel.py +++ b/unittests/test_panel.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_pen.py b/unittests/test_pen.py index 50f7dc24..de174288 100644 --- a/unittests/test_pen.py +++ b/unittests/test_pen.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_pi_import.py b/unittests/test_pi_import.py index a2f352f2..e5bb02db 100644 --- a/unittests/test_pi_import.py +++ b/unittests/test_pi_import.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import sys, os, subprocess #--------------------------------------------------------------------------- diff --git a/unittests/test_pickers.py b/unittests/test_pickers.py index 585bc02c..0665ca99 100644 --- a/unittests/test_pickers.py +++ b/unittests/test_pickers.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_platinfo.py b/unittests/test_platinfo.py index 9e603eb4..48e2def9 100644 --- a/unittests/test_platinfo.py +++ b/unittests/test_platinfo.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_popupwin.py b/unittests/test_popupwin.py index 6ee87b69..76e7833f 100644 --- a/unittests/test_popupwin.py +++ b/unittests/test_popupwin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_position.py b/unittests/test_position.py index 5f2c8d0c..dc514186 100644 --- a/unittests/test_position.py +++ b/unittests/test_position.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_power.py b/unittests/test_power.py index c3509e5c..024235a3 100644 --- a/unittests/test_power.py +++ b/unittests/test_power.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_preferences.py b/unittests/test_preferences.py index d2a90cf8..1bc0a2e9 100644 --- a/unittests/test_preferences.py +++ b/unittests/test_preferences.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_printdlg.py b/unittests/test_printdlg.py index 6d26435c..3270aae2 100644 --- a/unittests/test_printdlg.py +++ b/unittests/test_printdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_printfw.py b/unittests/test_printfw.py index 89a19d13..b7f5041f 100644 --- a/unittests/test_printfw.py +++ b/unittests/test_printfw.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_process.py b/unittests/test_process.py index c68b0833..c53d813e 100644 --- a/unittests/test_process.py +++ b/unittests/test_process.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys, os diff --git a/unittests/test_progdlg.py b/unittests/test_progdlg.py index 573c7427..8ea57421 100644 --- a/unittests/test_progdlg.py +++ b/unittests/test_progdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_pyevent.py b/unittests/test_pyevent.py index f7e75155..557c6b87 100644 --- a/unittests/test_pyevent.py +++ b/unittests/test_pyevent.py @@ -1,5 +1,5 @@ import sys -import imp_unittest, unittest, wtc +import unittest, wtc import wx ##import os; print 'PID:', os.getpid(); raw_input('Ready to start, press enter...') diff --git a/unittests/test_radiobox.py b/unittests/test_radiobox.py index 69723f97..1fa80309 100644 --- a/unittests/test_radiobox.py +++ b/unittests/test_radiobox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_radiobut.py b/unittests/test_radiobut.py index 3cd7e7cc..8bea8987 100644 --- a/unittests/test_radiobut.py +++ b/unittests/test_radiobut.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_rawbmp.py b/unittests/test_rawbmp.py index 83c748b6..1a05e841 100644 --- a/unittests/test_rawbmp.py +++ b/unittests/test_rawbmp.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_rearrangectrl.py b/unittests/test_rearrangectrl.py index 525ab1bb..481547af 100644 --- a/unittests/test_rearrangectrl.py +++ b/unittests/test_rearrangectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_region.py b/unittests/test_region.py index f86059ee..23564cd1 100644 --- a/unittests/test_region.py +++ b/unittests/test_region.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys, os diff --git a/unittests/test_renderer.py b/unittests/test_renderer.py index d2f049ad..7d9679ae 100644 --- a/unittests/test_renderer.py +++ b/unittests/test_renderer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_richmsgdlg.py b/unittests/test_richmsgdlg.py index 5ebb6b10..db0d8132 100644 --- a/unittests/test_richmsgdlg.py +++ b/unittests/test_richmsgdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_richtextbuffer.py b/unittests/test_richtextbuffer.py index 1c2adbb1..19ca6980 100644 --- a/unittests/test_richtextbuffer.py +++ b/unittests/test_richtextbuffer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextctrl.py b/unittests/test_richtextctrl.py index 4e9b330a..6ed363c1 100644 --- a/unittests/test_richtextctrl.py +++ b/unittests/test_richtextctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextformatdlg.py b/unittests/test_richtextformatdlg.py index 1b7eb483..24bbd583 100644 --- a/unittests/test_richtextformatdlg.py +++ b/unittests/test_richtextformatdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtexthtml.py b/unittests/test_richtexthtml.py index ac13d0c3..18f22ae0 100644 --- a/unittests/test_richtexthtml.py +++ b/unittests/test_richtexthtml.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextprint.py b/unittests/test_richtextprint.py index 5fbf956a..6ad5cc09 100644 --- a/unittests/test_richtextprint.py +++ b/unittests/test_richtextprint.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextstyledlg.py b/unittests/test_richtextstyledlg.py index e0bc9561..f0d6ab8e 100644 --- a/unittests/test_richtextstyledlg.py +++ b/unittests/test_richtextstyledlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextstyles.py b/unittests/test_richtextstyles.py index ed99ae70..41c1d18e 100644 --- a/unittests/test_richtextstyles.py +++ b/unittests/test_richtextstyles.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextsymboldlg.py b/unittests/test_richtextsymboldlg.py index 32dcce65..25c6b10e 100644 --- a/unittests/test_richtextsymboldlg.py +++ b/unittests/test_richtextsymboldlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtextxml.py b/unittests/test_richtextxml.py index b7f00059..a2b10e85 100644 --- a/unittests/test_richtextxml.py +++ b/unittests/test_richtextxml.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.richtext diff --git a/unittests/test_richtooltip.py b/unittests/test_richtooltip.py index 59a7b97d..faaad0d8 100644 --- a/unittests/test_richtooltip.py +++ b/unittests/test_richtooltip.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_sashwin.py b/unittests/test_sashwin.py index 0b9dc9fb..2d388073 100644 --- a/unittests/test_sashwin.py +++ b/unittests/test_sashwin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_scrolbar.py b/unittests/test_scrolbar.py index dbd22711..92e14bc2 100644 --- a/unittests/test_scrolbar.py +++ b/unittests/test_scrolbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_scrolwin.py b/unittests/test_scrolwin.py index 117f89e7..41aa8206 100644 --- a/unittests/test_scrolwin.py +++ b/unittests/test_scrolwin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_settings.py b/unittests/test_settings.py index 2444a682..9bdb7471 100644 --- a/unittests/test_settings.py +++ b/unittests/test_settings.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_sizer.py b/unittests/test_sizer.py index 43925d4d..dde5073f 100644 --- a/unittests/test_sizer.py +++ b/unittests/test_sizer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_slider.py b/unittests/test_slider.py index e80941a4..57740bd5 100644 --- a/unittests/test_slider.py +++ b/unittests/test_slider.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_snglinst.py b/unittests/test_snglinst.py index 3aa0ae54..a3797cef 100644 --- a/unittests/test_snglinst.py +++ b/unittests/test_snglinst.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_sound.py b/unittests/test_sound.py index efcfa74e..01aa2142 100644 --- a/unittests/test_sound.py +++ b/unittests/test_sound.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_spinbutt.py b/unittests/test_spinbutt.py index cad668fc..ac8a06a4 100644 --- a/unittests/test_spinbutt.py +++ b/unittests/test_spinbutt.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_spinctrl.py b/unittests/test_spinctrl.py index 234807fc..b3642c57 100644 --- a/unittests/test_spinctrl.py +++ b/unittests/test_spinctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_splash.py b/unittests/test_splash.py index 27f53dd2..fd230dd1 100644 --- a/unittests/test_splash.py +++ b/unittests/test_splash.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_splitter.py b/unittests/test_splitter.py index 4bd0f7aa..9c240172 100644 --- a/unittests/test_splitter.py +++ b/unittests/test_splitter.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_srchctrl.py b/unittests/test_srchctrl.py index 7c94aeaf..e638c787 100644 --- a/unittests/test_srchctrl.py +++ b/unittests/test_srchctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_statbmp.py b/unittests/test_statbmp.py index 5a63898a..32ea5b85 100644 --- a/unittests/test_statbmp.py +++ b/unittests/test_statbmp.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_statbox.py b/unittests/test_statbox.py index 46ac6da8..50ddf8fc 100644 --- a/unittests/test_statbox.py +++ b/unittests/test_statbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_statline.py b/unittests/test_statline.py index 08288164..9efbd372 100644 --- a/unittests/test_statline.py +++ b/unittests/test_statline.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_stattext.py b/unittests/test_stattext.py index e0ff87e9..3c0afc4d 100644 --- a/unittests/test_stattext.py +++ b/unittests/test_stattext.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_statusbar.py b/unittests/test_statusbar.py index 721a6c52..22fc8c52 100644 --- a/unittests/test_statusbar.py +++ b/unittests/test_statusbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_stc.py b/unittests/test_stc.py index f5e1d37d..8dc3358a 100644 --- a/unittests/test_stc.py +++ b/unittests/test_stc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.stc as stc diff --git a/unittests/test_stdpaths.py b/unittests/test_stdpaths.py index 27f2574d..d1c51f04 100644 --- a/unittests/test_stdpaths.py +++ b/unittests/test_stdpaths.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_stockgdi.py b/unittests/test_stockgdi.py index 736600f5..41fe4c59 100644 --- a/unittests/test_stockgdi.py +++ b/unittests/test_stockgdi.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_stopwatch.py b/unittests/test_stopwatch.py index d7224af2..f806b660 100644 --- a/unittests/test_stopwatch.py +++ b/unittests/test_stopwatch.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_stream.py b/unittests/test_stream.py index 7324ecf7..fb1ec58d 100644 --- a/unittests/test_stream.py +++ b/unittests/test_stream.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.six as six diff --git a/unittests/test_string.py b/unittests/test_string.py index 5fb19deb..8fc9483e 100644 --- a/unittests/test_string.py +++ b/unittests/test_string.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import wx.lib.six as six import wtc diff --git a/unittests/test_sysopt.py b/unittests/test_sysopt.py index 25897a9d..723a80ed 100644 --- a/unittests/test_sysopt.py +++ b/unittests/test_sysopt.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_taskbar.py b/unittests/test_taskbar.py index 48fbd45a..a3772576 100644 --- a/unittests/test_taskbar.py +++ b/unittests/test_taskbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_textctrl.py b/unittests/test_textctrl.py index 0945a471..01fa3c40 100644 --- a/unittests/test_textctrl.py +++ b/unittests/test_textctrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_textdlg.py b/unittests/test_textdlg.py index cec3685c..176845cc 100644 --- a/unittests/test_textdlg.py +++ b/unittests/test_textdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_tglbtn.py b/unittests/test_tglbtn.py index f345dc72..9c45f787 100644 --- a/unittests/test_tglbtn.py +++ b/unittests/test_tglbtn.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_timectrl.py b/unittests/test_timectrl.py index d0c8702e..1e8161ed 100644 --- a/unittests/test_timectrl.py +++ b/unittests/test_timectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_timer.py b/unittests/test_timer.py index 300823d1..44d9e93b 100644 --- a/unittests/test_timer.py +++ b/unittests/test_timer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_tipdlg.py b/unittests/test_tipdlg.py index b6cbcdcd..c6db26a1 100644 --- a/unittests/test_tipdlg.py +++ b/unittests/test_tipdlg.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_tipwin.py b/unittests/test_tipwin.py index 33a211ce..2994d0b2 100644 --- a/unittests/test_tipwin.py +++ b/unittests/test_tipwin.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_toolbar.py b/unittests/test_toolbar.py index feb3dfd1..ba8a3e67 100644 --- a/unittests/test_toolbar.py +++ b/unittests/test_toolbar.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_toolbook.py b/unittests/test_toolbook.py index 172bc0ff..f1bd309a 100644 --- a/unittests/test_toolbook.py +++ b/unittests/test_toolbook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_tooltip.py b/unittests/test_tooltip.py index 05f1e191..21c5355f 100644 --- a/unittests/test_tooltip.py +++ b/unittests/test_tooltip.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_translation.py b/unittests/test_translation.py index 64c997d5..8b177155 100644 --- a/unittests/test_translation.py +++ b/unittests/test_translation.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_treebook.py b/unittests/test_treebook.py index a4c805fc..7f6d2ec0 100644 --- a/unittests/test_treebook.py +++ b/unittests/test_treebook.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_treectrl.py b/unittests/test_treectrl.py index 7cfa98fb..41c87b97 100644 --- a/unittests/test_treectrl.py +++ b/unittests/test_treectrl.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_treelist.py b/unittests/test_treelist.py index 89c3d381..bc0c28ac 100644 --- a/unittests/test_treelist.py +++ b/unittests/test_treelist.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.dataview diff --git a/unittests/test_uiaction.py b/unittests/test_uiaction.py index 1344bcf9..6402c17c 100644 --- a/unittests/test_uiaction.py +++ b/unittests/test_uiaction.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys, os diff --git a/unittests/test_utils.py b/unittests/test_utils.py index b8967a4b..138a4cbe 100644 --- a/unittests/test_utils.py +++ b/unittests/test_utils.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_validate.py b/unittests/test_validate.py index 57d42b73..8ebf9e30 100644 --- a/unittests/test_validate.py +++ b/unittests/test_validate.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import os diff --git a/unittests/test_variant.py b/unittests/test_variant.py index 428916c0..a8fff102 100644 --- a/unittests/test_variant.py +++ b/unittests/test_variant.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_vidmode.py b/unittests/test_vidmode.py index 0f392c92..461d7f60 100644 --- a/unittests/test_vidmode.py +++ b/unittests/test_vidmode.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_virtualOverride.py b/unittests/test_virtualOverride.py index b7cd489f..086c1119 100644 --- a/unittests/test_virtualOverride.py +++ b/unittests/test_virtualOverride.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_vlbox.py b/unittests/test_vlbox.py index 53246e9c..af602bd9 100644 --- a/unittests/test_vlbox.py +++ b/unittests/test_vlbox.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_vscroll.py b/unittests/test_vscroll.py index bce1e79a..99adbf98 100644 --- a/unittests/test_vscroll.py +++ b/unittests/test_vscroll.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_wacky_ints.py b/unittests/test_wacky_ints.py index 2eba3d46..e16c16ca 100644 --- a/unittests/test_wacky_ints.py +++ b/unittests/test_wacky_ints.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_webkit.py b/unittests/test_webkit.py index d4774563..b7c4b74b 100644 --- a/unittests/test_webkit.py +++ b/unittests/test_webkit.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import sys diff --git a/unittests/test_webview.py b/unittests/test_webview.py index 73052a66..d6bd6ae3 100644 --- a/unittests/test_webview.py +++ b/unittests/test_webview.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.html2 as webview diff --git a/unittests/test_window.py b/unittests/test_window.py index 015d3059..272985fa 100644 --- a/unittests/test_window.py +++ b/unittests/test_window.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.lib.six as six diff --git a/unittests/test_windowid.py b/unittests/test_windowid.py index 203df9eb..8fc2edff 100644 --- a/unittests/test_windowid.py +++ b/unittests/test_windowid.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx diff --git a/unittests/test_windowlist.py b/unittests/test_windowlist.py index 08f435f1..6a5af7ce 100644 --- a/unittests/test_windowlist.py +++ b/unittests/test_windowlist.py @@ -1,5 +1,5 @@ import sys -import imp_unittest, unittest +import unittest import wx import wtc ##import os; print 'PID:', os.getpid(); raw_input('Ready to start, press enter...') diff --git a/unittests/test_wizard.py b/unittests/test_wizard.py index a6be0444..f97ac9c6 100644 --- a/unittests/test_wizard.py +++ b/unittests/test_wizard.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.adv diff --git a/unittests/test_wrapsizer.py b/unittests/test_wrapsizer.py index 69b99c6a..083cb049 100644 --- a/unittests/test_wrapsizer.py +++ b/unittests/test_wrapsizer.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx diff --git a/unittests/test_wxdatetime.py b/unittests/test_wxdatetime.py index 875009dd..4ab618e8 100644 --- a/unittests/test_wxdatetime.py +++ b/unittests/test_wxdatetime.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import wx.lib.six as six import wtc diff --git a/unittests/test_xml.py b/unittests/test_xml.py index 79163156..69e305f0 100644 --- a/unittests/test_xml.py +++ b/unittests/test_xml.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.xml as xml diff --git a/unittests/test_xrc.py b/unittests/test_xrc.py index eb0c1c1b..3461ea03 100644 --- a/unittests/test_xrc.py +++ b/unittests/test_xrc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wtc import wx import wx.xrc as xrc diff --git a/unittests/wtc.py b/unittests/wtc.py index 46be2978..8fe04458 100644 --- a/unittests/wtc.py +++ b/unittests/wtc.py @@ -1,4 +1,4 @@ -import imp_unittest, unittest +import unittest import wx import sys, os import wx.lib.six as six