Changeset 4255

Show
Ignore:
Timestamp:
03/02/09 22:54:54 (4 years ago)
Author:
gpolo
Message:

Ran something to fix the still remaining old imports.

Location:
trunk
Files:
28 modified

Legend:

Unmodified
Added
Removed

  • trunk/install_scripts/unix/setup.py

    r4253 r4255  
    9494            glob(os.path.join(config_dir, '*.txt'))), 
    9595 
    96         # umitDB SQL 
     96        # umit.db SQL 
    9797        (sql_dir, glob(os.path.join(sql_dir, '*.sql'))), 
    9898 

  • trunk/install_scripts/windows/setup.py

    r4245 r4255  
    114114            glob(os.path.join(pixmaps_dir, 'uie', '*.png'))), 
    115115 
    116         # umitDB SQL 
     116        # umit.db SQL 
    117117        (sql_dir, glob(os.path.join(sql_dir, '*.sql'))), 
    118118 
    … …  
    141141# does not handle such situtation and thus win32com.shell (which is 
    142142# really win32comext.shell) cannot be found. Let's fix this here so 
    143 # umitCore.BasePaths still works after we run py2exe over it. 
     143# umit.core.BasePaths still works after we run py2exe over it. 
    144144try: 
    145145    import py2exe.mf as modulefinder 

  • trunk/source-plugins/builder.py

    r3792 r4255  
    3232sys.path.insert(0, root) 
    3333 
    34 from umitCore.Paths import Path 
     34from umit.core.Paths import Path 
    3535Path.set_umit_conf(os.path.split(sys.argv[0])[0]) 
    3636 

  • trunk/source-plugins/context-menu/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/context-menu/sources/main.py

    r3792 r4255  
    2222import sys 
    2323 
    24 from umitPlugin.Core import Core 
    25 from umitPlugin.Engine import Plugin 
     24from umit.plugin.Core import Core 
     25from umit.plugin.Engine import Plugin 
    2626from higwidgets.higanimates import HIGAnimatedBar 
    27 from umitGUI.ScanNotebook import ScanNotebookPage, ScanResult 
     27from umit.gui.ScanNotebook import ScanNotebookPage, ScanResult 
    2828 
    2929class MyWidget(HIGAnimatedBar): 

  • trunk/source-plugins/dummy-working/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/dummy-working/sources/main.py

    r3792 r4255  
    2424import dummy.dep 
    2525 
    26 from umitPlugin.Engine import Plugin 
     26from umit.plugin.Engine import Plugin 
    2727from higwidgets.higdialogs import HIGAlertDialog 
    2828 

  • trunk/source-plugins/flow-analyzer/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/flow-analyzer/sources/main.py

    r3792 r4255  
    2222import sys 
    2323 
    24 from umitPlugin.Core import Core 
    25 from umitPlugin.Engine import Plugin 
     24from umit.plugin.Core import Core 
     25from umit.plugin.Engine import Plugin 
    2626from higwidgets.higanimates import HIGAnimatedBar 
    27 from umitGUI.ScanNotebook import ScanNotebookPage 
     27from umit.gui.ScanNotebook import ScanNotebookPage 
    2828 
    2929class FlowContainer(gtk.VBox): 

  • trunk/source-plugins/localized-example/setup.py

    r3792 r4255  
    2323 
    2424from glob import glob 
    25 from umitPlugin.Containers import setup 
     25from umit.plugin.Containers import setup 
    2626 
    2727mo_files = [] 

  • trunk/source-plugins/localized-example/sources/main.py

    r3792 r4255  
    2121import gettext 
    2222 
    23 from umitPlugin.Core import Core 
    24 from umitPlugin.Engine import Plugin 
    25 from umitPlugin.Atoms import StringFile 
     23from umit.plugin.Core import Core 
     24from umit.plugin.Engine import Plugin 
     25from umit.plugin.Atoms import StringFile 
    2626 
    2727_ = str 

  • trunk/source-plugins/system-info-consumer/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/system-info-consumer/sources/main.py

    r4113 r4255  
    2222import gtk 
    2323 
    24 from umitPlugin.Core import Core 
    25 from umitPlugin.Engine import Plugin 
     24from umit.plugin.Core import Core 
     25from umit.plugin.Engine import Plugin 
    2626from higwidgets.higdialogs import HIGAlertDialog 
    2727 

  • trunk/source-plugins/system-info/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/system-info/sources/main.py

    r4113 r4255  
    2020 
    2121import os, sys 
    22 from umitPlugin.Engine import Plugin 
     22from umit.plugin.Engine import Plugin 
    2323from functools import update_wrapper 
    2424 

  • trunk/source-plugins/tabber/setup.py

    r3792 r4255  
    2323 
    2424from distutils.core import Extension 
    25 from umitPlugin.Containers import setup 
     25from umit.plugin.Containers import setup 
    2626 
    2727# Dirty hack :P 

  • trunk/source-plugins/tabber/sources/main.py

    r3792 r4255  
    2525import tabber.views as views 
    2626 
    27 from umitPlugin.Core import Core 
    28 from umitPlugin.Engine import Plugin 
     27from umit.plugin.Core import Core 
     28from umit.plugin.Engine import Plugin 
    2929 
    3030class TabberPlugin(Plugin): 

  • trunk/source-plugins/terminal-pad/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/terminal-pad/sources/main.py

    r3792 r4255  
    2222import gobject 
    2323 
    24 from umitPlugin.Core import Core 
    25 from umitPlugin.Engine import Plugin 
     24from umit.plugin.Core import Core 
     25from umit.plugin.Engine import Plugin 
    2626 
    2727from higwidgets.hignotebooks import HIGAnimatedTabLabel 

  • trunk/source-plugins/tray-icon/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/tray-icon/sources/main.py

    r3792 r4255  
    2222 
    2323from higwidgets.higtooltips import * 
    24 from umitPlugin.Engine import Plugin 
     24from umit.plugin.Engine import Plugin 
    2525 
    2626class TrayPlugin(Plugin): 

  • trunk/source-plugins/umit-console/setup.py

    r3792 r4255  
    1919# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
    2020 
    21 from umitPlugin.Containers import setup 
     21from umit.plugin.Containers import setup 
    2222 
    2323setup( 

  • trunk/source-plugins/umit-console/sources/main.py

    r3792 r4255  
    2828from tabber.views import UmitView 
    2929 
    30 from umitCore.I18N import _ 
    31 from umitPlugin.Core import Core 
    32 from umitPlugin.Engine import Plugin 
    33 from umitPlugin.Atoms import Singleton 
     30from umit.core.I18N import _ 
     31from umit.plugin.Core import Core 
     32from umit.plugin.Engine import Plugin 
     33from umit.plugin.Atoms import Singleton 
    3434from higwidgets.higbuttons import HIGButton 
    3535from higwidgets.higtooltips import HIGTooltip, HIGTooltipData 
    … …  
    4747      "used to interact with <b>UMIT</b> codebase and his <i>UI</i>.\n" 
    4848      "For example try typing:\n\n" 
    49       "<tt>from umitPlugin.Core import Core</tt>\n" 
     49      "<tt>from umit.plugin.Core import Core</tt>\n" 
    5050      "<tt>Core().get_main_toolbar().hide()</tt>\n") 
    5151] 

  • trunk/tests/core/test_nmapcommand.py

    r4122 r4255  
    11import unittest 
    22 
    3 from umitCore.NmapCommand import split_quoted 
     3from umit.core.NmapCommand import split_quoted 
    44 
    55class SplitQuotedTest(unittest.TestCase): 

  • trunk/tests/core/test_option_parser.py

    r4121 r4255  
    1919 
    2020import unittest 
    21 from umitCore.UmitOptionParser import UmitOptionParser 
     21from umit.core.UmitOptionParser import UmitOptionParser 
    2222 
    2323class TestUmitOptionParser(unittest.TestCase): 

  • trunk/tests/core/test_paths.py

    r4121 r4255  
    2222# Setting up Paths so UmitConf can be correctly loaded 
    2323from os.path import join, split, abspath, exists 
    24 from umitCore.Paths import Paths 
     24from umit.core.Paths import Paths 
    2525 
    2626 

  • trunk/tests/core/test_target_list.py

    r4121 r4255  
    2121# Setting up Paths so UmitConf can be correctly loaded 
    2222from os.path import join 
    23 from umitCore.Paths import Path 
     23from umit.core.Paths import Path 
    2424Path.set_umit_conf([join("share", "umit", "config", "umit.conf")]) 
    2525 
    2626# Loading UmitConf files 
    27 from umitCore.TargetList import target_list 
     27from umit.core.TargetList import target_list 
    2828 
    2929 

  • trunk/tests/core/test_umit_conf.py

    r4121 r4255  
    2222# Setting up Paths so UmitConf can be correctly loaded 
    2323from os.path import join 
    24 from umitCore.Paths import Path 
     24from umit.core.Paths import Path 
    2525Path.set_umit_conf([join("share", "umit", "config", "umit.conf")]) 
    2626 
    2727# Loading UmitConf files 
    28 from umitCore.UmitConf import * 
     28from umit.core.UmitConf import * 
    2929 
    3030