Changeset 4266

Timestamp:

03/04/09 16:10:40 (4 years ago)

Author:

luis

Message:

Merged revisions 4248,4253,4255 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4248 | gpolo | 2009-03-02 19:06:01 +0000 (Mon, 02 Mar 2009) | 1 line

test_paths.sh has been abandoned too, gone now.

........

r4253 | gpolo | 2009-03-02 21:09:01 +0000 (Mon, 02 Mar 2009) | 1 line

Fixed ticket #234: Do not install the utils package in site-packages.

........

r4255 | gpolo | 2009-03-02 22:54:54 +0000 (Mon, 02 Mar 2009) | 1 line

Ran something to fix the still remaining old imports.

........

Location:

branch/InterfaceEditor

Files:

• . (modified) (1 prop)
• MANIFEST.in (modified) (1 diff)
• install_scripts/unix/setup.py (modified) (2 diffs)
• install_scripts/windows/setup.py (modified) (2 diffs)
• source-plugins/builder.py (modified) (1 diff)
• source-plugins/context-menu/setup.py (modified) (1 diff)
• source-plugins/context-menu/sources/main.py (modified) (1 diff)
• source-plugins/dummy-working/setup.py (modified) (1 diff)
• source-plugins/dummy-working/sources/main.py (modified) (1 diff)
• source-plugins/flow-analyzer/setup.py (modified) (1 diff)
• source-plugins/flow-analyzer/sources/main.py (modified) (1 diff)
• source-plugins/localized-example/setup.py (modified) (1 diff)
• source-plugins/localized-example/sources/main.py (modified) (1 diff)
• source-plugins/system-info-consumer/setup.py (modified) (1 diff)
• source-plugins/system-info-consumer/sources/main.py (modified) (1 diff)
• source-plugins/system-info/setup.py (modified) (1 diff)
• source-plugins/system-info/sources/main.py (modified) (1 diff)
• source-plugins/tabber/setup.py (modified) (1 diff)
• source-plugins/tabber/sources/main.py (modified) (1 diff)
• source-plugins/terminal-pad/setup.py (modified) (1 diff)
• source-plugins/terminal-pad/sources/main.py (modified) (1 diff)
• source-plugins/tray-icon/setup.py (modified) (1 diff)
• source-plugins/tray-icon/sources/main.py (modified) (1 diff)
• source-plugins/umit-console/setup.py (modified) (1 diff)
• source-plugins/umit-console/sources/main.py (modified) (2 diffs)

branch/InterfaceEditor/MANIFEST.in

@@ -11 +11 @@
 recursive-include umit *.py
 recursive-include higwidgets *.py
+recursive-include utils *.py

branch/InterfaceEditor/install_scripts/unix/setup.py

@@ -94 +94 @@
             glob(os.path.join(config_dir, '*.txt'))),
 
-        # umitDB SQL
+        # umit.db SQL
         (sql_dir, glob(os.path.join(sql_dir, '*.sql'))),
 
@@ -363 +363 @@
           'umit.gui', 'umit.gui.radialnet', 'umit.interfaceeditor',
           'umit.interfaceeditor.selectborder', 'umit.inventory',
-          'umit.plugin', 'higwidgets', 'utils'],
+          'umit.plugin', 'higwidgets'],
       data_files = data_files,
       cmdclass = {

branch/InterfaceEditor/install_scripts/windows/setup.py

@@ -114 +114 @@
             glob(os.path.join(pixmaps_dir, 'uie', '*.png'))),
 
-        # umitDB SQL
+        # umit.db SQL
         (sql_dir, glob(os.path.join(sql_dir, '*.sql'))),
 
@@ -141 +141 @@
 # does not handle such situtation and thus win32com.shell (which is
 # really win32comext.shell) cannot be found. Let's fix this here so
-# umitCore.BasePaths still works after we run py2exe over it.
+# umit.core.BasePaths still works after we run py2exe over it.
 try:
     import py2exe.mf as modulefinder

branch/InterfaceEditor/source-plugins/builder.py

@@ -32 +32 @@
 sys.path.insert(0, root)
 
-from umitCore.Paths import Path
+from umit.core.Paths import Path
 Path.set_umit_conf(os.path.split(sys.argv[0])[0])
 

branch/InterfaceEditor/source-plugins/context-menu/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/context-menu/sources/main.py

@@ -22 +22 @@
 import sys
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
 from higwidgets.higanimates import HIGAnimatedBar
-from umitGUI.ScanNotebook import ScanNotebookPage, ScanResult
+from umit.gui.ScanNotebook import ScanNotebookPage, ScanResult
 
 class MyWidget(HIGAnimatedBar):

branch/InterfaceEditor/source-plugins/dummy-working/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/dummy-working/sources/main.py

@@ -24 +24 @@
 import dummy.dep
 
-from umitPlugin.Engine import Plugin
+from umit.plugin.Engine import Plugin
 from higwidgets.higdialogs import HIGAlertDialog
 

branch/InterfaceEditor/source-plugins/flow-analyzer/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/flow-analyzer/sources/main.py

@@ -22 +22 @@
 import sys
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
 from higwidgets.higanimates import HIGAnimatedBar
-from umitGUI.ScanNotebook import ScanNotebookPage
+from umit.gui.ScanNotebook import ScanNotebookPage
 
 class FlowContainer(gtk.VBox):

branch/InterfaceEditor/source-plugins/localized-example/setup.py

@@ -23 +23 @@
 
 from glob import glob
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 mo_files = []

branch/InterfaceEditor/source-plugins/localized-example/sources/main.py

@@ -21 +21 @@
 import gettext
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
-from umitPlugin.Atoms import StringFile
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
+from umit.plugin.Atoms import StringFile
 
 _ = str

branch/InterfaceEditor/source-plugins/system-info-consumer/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/system-info-consumer/sources/main.py

@@ -22 +22 @@
 import gtk
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
 from higwidgets.higdialogs import HIGAlertDialog
 

branch/InterfaceEditor/source-plugins/system-info/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/system-info/sources/main.py

@@ -20 +20 @@
 
 import os, sys
-from umitPlugin.Engine import Plugin
+from umit.plugin.Engine import Plugin
 from functools import update_wrapper
 

branch/InterfaceEditor/source-plugins/tabber/setup.py

@@ -23 +23 @@
 
 from distutils.core import Extension
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 # Dirty hack :P

branch/InterfaceEditor/source-plugins/tabber/sources/main.py

@@ -25 +25 @@
 import tabber.views as views
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
 
 class TabberPlugin(Plugin):

branch/InterfaceEditor/source-plugins/terminal-pad/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/terminal-pad/sources/main.py

@@ -22 +22 @@
 import gobject
 
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
 
 from higwidgets.hignotebooks import HIGAnimatedTabLabel

branch/InterfaceEditor/source-plugins/tray-icon/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/tray-icon/sources/main.py

@@ -22 +22 @@
 
 from higwidgets.higtooltips import *
-from umitPlugin.Engine import Plugin
+from umit.plugin.Engine import Plugin
 
 class TrayPlugin(Plugin):

branch/InterfaceEditor/source-plugins/umit-console/setup.py

@@ -19 +19 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
-from umitPlugin.Containers import setup
+from umit.plugin.Containers import setup
 
 setup(

branch/InterfaceEditor/source-plugins/umit-console/sources/main.py

@@ -28 +28 @@
 from tabber.views import UmitView
 
-from umitCore.I18N import _
-from umitPlugin.Core import Core
-from umitPlugin.Engine import Plugin
-from umitPlugin.Atoms import Singleton
+from umit.core.I18N import _
+from umit.plugin.Core import Core
+from umit.plugin.Engine import Plugin
+from umit.plugin.Atoms import Singleton
 from higwidgets.higbuttons import HIGButton
 from higwidgets.higtooltips import HIGTooltip, HIGTooltipData
@@ -47 +47 @@
       "used to interact with <b>UMIT</b> codebase and his <i>UI</i>.\n"
       "For example try typing:\n\n"
-      "<tt>from umitPlugin.Core import Core</tt>\n"
+      "<tt>from umit.plugin.Core import Core</tt>\n"
       "<tt>Core().get_main_toolbar().hide()</tt>\n")
 ]