[Pymerase-cvs-commit] pymerase/output CreatePyTkWidgets.py,1.10,1.11 CreateHtmlForms.py,1.17,1.18 CreateDBEditor.py,1.13,1.14 CreateReport.py,1.2,1.3 CreateDBAPI.py,1.25,1.26 CreateSQL.py,1.13,1.14 iPymerase.py,1.5,1.6 CreatePythonAPI.py,1.1,1.2

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase/output
In directory sc8-pr-cvs1:/tmp/cvs-serv29696

Modified Files:
	CreatePyTkWidgets.py CreateHtmlForms.py CreateDBEditor.py 
	CreateReport.py CreateDBAPI.py CreateSQL.py iPymerase.py 
	CreatePythonAPI.py 
Log Message:
Updated for setup.py install script


Index: CreatePyTkWidgets.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreatePyTkWidgets.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CreatePyTkWidgets.py	31 Jan 2003 19:32:34 -0000	1.10
--- CreatePyTkWidgets.py	5 Feb 2003 22:58:33 -0000	1.11
***************
*** 40,48 ****
  import shutil
  
! from output.PyTkWidgets import HelperUtil
! from output.PyTkWidgets.Templates import Templates
! from util import PymeraseType
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
  
  ############################
--- 40,48 ----
  import shutil
  
! from pymerase.output.PyTkWidgets import HelperUtil
! from pymerase.output.PyTkWidgets.Templates import Templates
! from pymerase.util import PymeraseType
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
  
  ############################

Index: CreateHtmlForms.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateHtmlForms.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CreateHtmlForms.py	11 Dec 2002 20:26:31 -0000	1.17
--- CreateHtmlForms.py	5 Feb 2003 22:58:33 -0000	1.18
***************
*** 41,48 ****
  
  sys.path.append("../pymerase")
! from output.webUtil import HTMLUtil
! from util import PymeraseType
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
  
  ############################
--- 41,48 ----
  
  sys.path.append("../pymerase")
! from pymerase.output.webUtil import HTMLUtil
! from pymerase.util import PymeraseType
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
  
  ############################

Index: CreateDBEditor.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateDBEditor.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CreateDBEditor.py	11 Dec 2002 22:34:51 -0000	1.13
--- CreateDBEditor.py	5 Feb 2003 22:58:33 -0000	1.14
***************
*** 38,47 ****
  #from mx import DateTime
  
! from output.webUtil import makePackage
! from output.webUtil import CodeUtil
! from output.webUtil import HTMLUtil
! from util.fk_util import fk_util
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
  
  codeUtil = CodeUtil.CodeUtil()
--- 38,47 ----
  #from mx import DateTime
  
! from pymerase.output.webUtil import makePackage
! from pymerase.output.webUtil import CodeUtil
! from pymerase.output.webUtil import HTMLUtil
! from pymerase.util.fk_util import fk_util
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
  
  codeUtil = CodeUtil.CodeUtil()

Index: CreateReport.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateReport.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CreateReport.py	31 Jan 2003 18:04:30 -0000	1.2
--- CreateReport.py	5 Feb 2003 22:58:33 -0000	1.3
***************
*** 39,44 ****
  import string
  
! from ClassMembers import getAllAttributes
! from ClassMembers import getAllAssociations
  
  ############################
--- 39,44 ----
  import string
  
! from pymerase.ClassMembers import getAllAttributes
! from pymerase.ClassMembers import getAllAssociations
  
  ############################

Index: CreateDBAPI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateDBAPI.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** CreateDBAPI.py	18 Jan 2003 01:35:32 -0000	1.25
--- CreateDBAPI.py	5 Feb 2003 22:58:33 -0000	1.26
***************
*** 44,53 ****
  import types
  import shutil
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
! from output.dbAPI import fkeyTypes
  
  import warnings
! from util.Warnings import DebugWarning
  from warnings import warn
  
--- 44,53 ----
  import types
  import shutil
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
! from pymerase.output.dbAPI import fkeyTypes
  
  import warnings
! from pymerase.util.Warnings import DebugWarning
  from warnings import warn
  
***************
*** 422,427 ****
    # write the package definition
    if 1:
!     import output.dbAPI
!     module_pathname = output.dbAPI.__path__[0]
      module_path = module_pathname
    else:
--- 422,427 ----
    # write the package definition
    if 1:
!     import pymerase.output.dbAPI
!     module_pathname = pymerase.output.dbAPI.__path__[0]
      module_path = module_pathname
    else:

Index: CreateSQL.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreateSQL.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CreateSQL.py	19 Nov 2002 00:47:51 -0000	1.13
--- CreateSQL.py	5 Feb 2003 22:58:33 -0000	1.14
***************
*** 39,47 ****
  import string
  import types
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
  
  import warnings
! from util.Warnings import DebugWarning
  from warnings import warn
  
--- 39,47 ----
  import string
  import types
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
  
  import warnings
! from pymerase.util.Warnings import DebugWarning
  from warnings import warn
  

Index: iPymerase.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/iPymerase.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** iPymerase.py	30 Oct 2002 23:05:15 -0000	1.5
--- iPymerase.py	5 Feb 2003 22:58:33 -0000	1.6
***************
*** 42,46 ****
    from IPython.Shell import IPythonShellEmbed
    #import convienance functions
!   from util.iPymeraseUtil import *
  
    msg = []
--- 42,46 ----
    from IPython.Shell import IPythonShellEmbed
    #import convienance functions
!   from pymerase.util.iPymeraseUtil import *
  
    msg = []

Index: CreatePythonAPI.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/output/CreatePythonAPI.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CreatePythonAPI.py	15 Aug 2002 00:49:19 -0000	1.1
--- CreatePythonAPI.py	5 Feb 2003 22:58:33 -0000	1.2
***************
*** 45,54 ****
  import shutil
  import inspect
! from util.output import *
! from util.SortMetaInfo import forwardDeclarationSort
! from output.PythonAPI import fkeyTypes
  
  import warnings
! from util.Warnings import DebugWarning
  from warnings import warn
  
--- 45,54 ----
  import shutil
  import inspect
! from pymerase.util.output import *
! from pymerase.util.SortMetaInfo import forwardDeclarationSort
! from pymerase.output.PythonAPI import fkeyTypes
  
  import warnings
! from pymerase.util.Warnings import DebugWarning
  from warnings import warn