[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue appserver/src/geasRpcServer.py appserver/s...
|
From: |
Jason Cater |
|
Subject: |
gnue appserver/src/geasRpcServer.py appserver/s... |
|
Date: |
Tue, 17 Sep 2002 11:27:46 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 02/09/17 11:27:45
Modified files:
appserver/src : geasRpcServer.py
appserver/src/_featuretest: gcdParser.py geasTools.py
appserver/src/objrepos: geasClassDefs.py
common/src : GBaseApp.py GComm.py GConfig.py GConnections.py
__init__.py
common/src/commdrivers/_helpers: RpcDoc.py
common/src/commdrivers/_test: server.py
common/src/dbdrivers/mxodbc: DBdriver.py
designer/src : Designer.py Instance.py TemplateParser.py
ToolSupport.py
designer/templates: __init__.py
forms/src : GFClient.py GFForm.py GFKeyMapper.py
forms/src/uidrivers/gtk2: UIdriver.py
forms/src/uidrivers/nstti: UIdriver.py
forms/src/uidrivers/wx: UIdriver.py
navigator/src : GNClient.py UIwxpython.py
reports/adapters/filters/sablotron: Adapter.py
reports/src : GREngine.py GRFilters.py
Added files:
common/src : FileUtils.py TextUtils.py
common/src/gear: __init__.py
Log message:
removed code from gnue.common.__init__ and placed in either
gnue.common.FileUtils or gnue.common.TextUtils; added stub for gear support
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/geasRpcServer.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/gcdParser.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/_featuretest/geasTools.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/objrepos/geasClassDefs.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/FileUtils.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/TextUtils.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GBaseApp.py.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GComm.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConfig.py.diff?tr1=1.25&tr2=1.26&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GConnections.py.diff?tr1=1.40&tr2=1.41&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/__init__.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_helpers/RpcDoc.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/commdrivers/_test/server.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mxodbc/DBdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/gear/__init__.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Designer.py.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/Instance.py.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/TemplateParser.py.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/ToolSupport.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/templates/__init__.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFClient.py.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFForm.py.diff?tr1=1.173&tr2=1.174&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/GFKeyMapper.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/gtk2/UIdriver.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/nstti/UIdriver.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/uidrivers/wx/UIdriver.py.diff?tr1=1.185&tr2=1.186&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/GNClient.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/UIwxpython.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/adapters/filters/sablotron/Adapter.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GREngine.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/GRFilters.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
Patches:
Index: gnue/appserver/src/_featuretest/gcdParser.py
diff -c gnue/appserver/src/_featuretest/gcdParser.py:1.1
gnue/appserver/src/_featuretest/gcdParser.py:1.2
*** gnue/appserver/src/_featuretest/gcdParser.py:1.1 Wed Jun 5 10:33:37 2002
--- gnue/appserver/src/_featuretest/gcdParser.py Tue Sep 17 11:27:44 2002
***************
*** 1,27 ****
# GNU Enterprise Application Server - List Object
#
- # Copyright 2001 Free Software Foundation
- #
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: gcdParser.py,v 1.1 2002/06/05 14:33:37 siesel Exp $
from gnue.common import GDataSource,GConditions
import geasInstance
import xreadlines, sys, string
--- 1,29 ----
# GNU Enterprise Application Server - List Object
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # Copyright 2001-2002 Free Software Foundation
! #
! # $Id: gcdParser.py,v 1.2 2002/09/17 15:27:44 jcater Exp $
!
from gnue.common import GDataSource,GConditions
+ from gnue.common.FileUtils import openResource
import geasInstance
import xreadlines, sys, string
***************
*** 30,53 ****
import urllib
import string
- #
- # Open a file or URL resource,
- # properly handling drive letters.
- # copy from gnue.common
- def openResource(resource):
- drive = os.path.splitdrive(resource)
- if len(drive[0]):
- return open(resource,'r')
- else:
- return urllib.urlopen(resource)
-
def findchar(str,charlist):
for i in charlist:
pos=string.find(str,i)
if pos!=-1:
return (pos,i)
!
return (-1,'')
class GcdParserError(Exception):
--- 32,44 ----
import urllib
import string
def findchar(str,charlist):
for i in charlist:
pos=string.find(str,i)
if pos!=-1:
return (pos,i)
!
return (-1,'')
class GcdParserError(Exception):
Index: gnue/appserver/src/_featuretest/geasTools.py
diff -c gnue/appserver/src/_featuretest/geasTools.py:1.1
gnue/appserver/src/_featuretest/geasTools.py:1.2
*** gnue/appserver/src/_featuretest/geasTools.py:1.1 Mon Jul 15 05:44:41 2002
--- gnue/appserver/src/_featuretest/geasTools.py Tue Sep 17 11:27:44 2002
***************
*** 4,27 ****
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasTools.py,v 1.1 2002/07/15 09:44:41 siesel Exp $
! from gnue.common import GDebug, openResource
import geasObject
from godlParser import loadDefinition
--- 4,28 ----
#
# This file is part of GNU Enterprise.
#
! # GNU Enterprise is free software; you can redistribute it
! # and/or modify it under the terms of the GNU General Public
! # License as published by the Free Software Foundation; either
# version 2, or (at your option) any later version.
#
! # GNU Enterprise is distributed in the hope that it will be
! # useful, but WITHOUT ANY WARRANTY; without even the implied
! # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
# PURPOSE. See the GNU General Public License for more details.
#
! # You should have received a copy of the GNU General Public
! # License along with program; see the file COPYING. If not,
! # write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
#
! # $Id: geasTools.py,v 1.2 2002/09/17 15:27:44 jcater Exp $
! from gnue.common import GDebug
! from gnue.common.FileUtils import openResource
import geasObject
from godlParser import loadDefinition
Index: gnue/appserver/src/geasRpcServer.py
diff -c gnue/appserver/src/geasRpcServer.py:1.12
gnue/appserver/src/geasRpcServer.py:1.13
*** gnue/appserver/src/geasRpcServer.py:1.12 Thu Jun 20 20:34:33 2002
--- gnue/appserver/src/geasRpcServer.py Tue Sep 17 11:27:43 2002
***************
*** 19,25 ****
#
# Copyright 2001-2002 Free Software Foundation
#
! # $Id: geasRpcServer.py,v 1.12 2002/06/21 00:34:33 siesel Exp $
from geasList import *
from geasSession import *
--- 19,25 ----
#
# Copyright 2001-2002 Free Software Foundation
#
! # $Id: geasRpcServer.py,v 1.13 2002/09/17 15:27:43 jcater Exp $
from geasList import *
from geasSession import *
***************
*** 56,62 ****
else:
return "Running (%s session created)" % self._sessNo
! from gnue.common import GComm, openResource, GLoginHandler, GConfig
from gnue.common.GServerApp import GServerApp
import time,os,sys
from gnue.appserver import VERSION
--- 56,63 ----
else:
return "Running (%s session created)" % self._sessNo
! from gnue.common import GComm, GLoginHandler, GConfig
! from gnue.common.FileUtils import openResource
from gnue.common.GServerApp import GServerApp
import time,os,sys
from gnue.appserver import VERSION
Index: gnue/appserver/src/objrepos/geasClassDefs.py
diff -c gnue/appserver/src/objrepos/geasClassDefs.py:1.2
gnue/appserver/src/objrepos/geasClassDefs.py:1.3
*** gnue/appserver/src/objrepos/geasClassDefs.py:1.2 Tue May 21 16:07:36 2002
--- gnue/appserver/src/objrepos/geasClassDefs.py Tue Sep 17 11:27:44 2002
***************
*** 30,36 ****
# part of the GEOR module of GEAS.
from gnue.common import GParser
! from gnue.common import openResource
###################################################
--- 30,36 ----
# part of the GEOR module of GEAS.
from gnue.common import GParser
! from gnue.common.FileUtils import openResource
###################################################
Index: gnue/common/src/GBaseApp.py
diff -c gnue/common/src/GBaseApp.py:1.24 gnue/common/src/GBaseApp.py:1.25
*** gnue/common/src/GBaseApp.py:1.24 Fri Jul 5 17:32:01 2002
--- gnue/common/src/GBaseApp.py Tue Sep 17 11:27:44 2002
***************
*** 41,47 ****
import os
import ConfigParser
import gettext
! from gnue.common import lineWrap
try:
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
--- 41,47 ----
import os
import ConfigParser
import gettext
! from gnue.common.TextUtils import lineWrap
try:
gettext.install('gnue',GConfig.getInstalledBase('install_prefix')+'/translations')
Index: gnue/common/src/GComm.py
diff -c gnue/common/src/GComm.py:1.19 gnue/common/src/GComm.py:1.20
*** gnue/common/src/GComm.py:1.19 Sun Jun 9 09:55:07 2002
--- gnue/common/src/GComm.py Tue Sep 17 11:27:44 2002
***************
*** 28,34 ****
#
import GDebug
! from gnue.common import dyn_import, openResource
##############################################################################
--- 28,34 ----
#
import GDebug
! from gnue.common.FileUtils import dyn_import, openResource
##############################################################################
Index: gnue/common/src/GConfig.py
diff -c gnue/common/src/GConfig.py:1.25 gnue/common/src/GConfig.py:1.26
*** gnue/common/src/GConfig.py:1.25 Wed Jun 5 19:02:09 2002
--- gnue/common/src/GConfig.py Tue Sep 17 11:27:44 2002
***************
*** 32,38 ****
from ConfigParser import *
import os, sys, string
! from gnue.common import openResource, lineWrap
import GDebug
import copy
--- 32,39 ----
from ConfigParser import *
import os, sys, string
! from gnue.common.FileUtils import openResource
! from gnue.common.TextUtils import lineWrap
import GDebug
import copy
Index: gnue/common/src/GConnections.py
diff -c gnue/common/src/GConnections.py:1.40
gnue/common/src/GConnections.py:1.41
*** gnue/common/src/GConnections.py:1.40 Mon Sep 16 15:30:16 2002
--- gnue/common/src/GConnections.py Tue Sep 17 11:27:44 2002
***************
*** 35,41 ****
import GDebug
import GDataObjects
import GLoginHandler
! from gnue.common import openResource, dyn_import
class Error(StandardError):
# Base error
--- 35,41 ----
import GDebug
import GDataObjects
import GLoginHandler
! from gnue.common.FileUtils import openResource, dyn_import
class Error(StandardError):
# Base error
Index: gnue/common/src/__init__.py
diff -c gnue/common/src/__init__.py:1.15 gnue/common/src/__init__.py:1.16
*** gnue/common/src/__init__.py:1.15 Sun Sep 15 16:54:57 2002
--- gnue/common/src/__init__.py Tue Sep 17 11:27:44 2002
***************
*** 55,239 ****
__version__ = VERSION
__hexversion__ = HEXVERSION
- import os,sys
- import urllib,urlparse,cStringIO,zipfile
- import string
-
- def buildNavigationfile(list,name,top=0):
- if top:
- navi='<?xml version="1.0"?>\n\n'+\
- '<processes title="Package '+name+'">\n'
- else:
- navi='<process title="'+name+'" id="'+name+'">\n'
-
- for i in list.keys():
- if type(list[i])==type(""):
- if i[-4:]==".grd":
- navi=navi+'<step type="report" location="'+list[i]+\
- '" title="'+i+'">\n<description><![CDATA['+\
- '<CENTER><H3>'+i+'</H3></CENTER>'+\
- ']]></description>\n</step>\n'
- elif i[-4:]==".gfd":
- navi=navi+'<step type="form" location="'+list[i]+\
- '" title="'+i+'">\n<description><![CDATA['+\
- '<CENTER><H3>'+i+'</H3></CENTER>'+\
- ']]></description>\n</step>\n'
- elif i[-4:]==".gnd":
- navi=navi+'<step type="navigator" location="'+list[i]+\
- '" title="'+i+'">\n<description><![CDATA['+\
- '<CENTER><H3>'+i+'</H3></CENTER>'+\
- ']]></description>\n</step>\n'
- elif i=="README":
- navi=navi+'<description><![CDATA[<H3 ALIGN="CENTER">README</H3>'+\
- list[i]+']]></description>\n'
- else:
- navi=navi+buildNavigationfile(list[i],i)
-
- if top:
- navi=navi+'</processes>\n'
- else:
- navi=navi+'</process>\n'
- return navi
-
-
-
- #
- # Open a file or URL resource,
- # properly handling drive letters.
- #
- def openResource(resource):
- drive = os.path.splitdrive(resource)
- if len(drive[0]):
- return open(resource,'r')
- else:
- (urltype, host, path, param, query, frag) = urlparse.urlparse(resource)
-
- if resource[-5:]==".gear":
- host=resource
- path=""
- urltype="gear"
-
- if urltype!="gear":
- return urllib.urlopen(resource)
-
- # load gear://archive/path/xxx.gfd
- # TODO: * add Zipfile write support. i.e. write stringbuffer into zipfile
- # if .. close is called
- # * provide zipfile cache, i.e. load zipfile just once into memory
-
- else:
- # urlparse sometimes didn't work correctly
- if host=="":
- # path="//host/path" -> path=path host=host
- pathlist=string.split(path[2:],"/",1)
- host=pathlist[0]
- path=pathlist[1]
-
- # check if host ends in ".gear"
- if host[-5:]!=".gear":
- host=host+".gear"
-
- # 1. search for gear in the local directory
- try:
- zf=zipfile.ZipFile(host, mode="r")
- except:
- # 2. search in the package directory
- if sys.platform=="win32":
- host=sys.prefix+"/packages/"+host
- else:
- host=os.environ["HOME"]+"/gnue/packages/"+host
-
- zf=zipfile.ZipFile(host, mode="r")
-
- if len(path):
- return cStringIO.StringIO(zf.read(path))
-
- # if no path provided, create a navigator file for this archive
- else:
- list=zf.namelist()
-
- # check if the zip file contains a default navigator file
- if "default.gpd" in list:
- return cStringIO.StringIO(zf.read("default.gpd"))
-
- # convert a single filename to a full gear url
- if resource[:5]!="gear:":
- resource="gear://"+resource+"/"
-
- # reorder pathlist
- newlist={}
- for i in list:
- ps=string.split(i,"/",1)
- if ps[0]=="":
- ps[0]==ps[1]
- ps[1]=""
- if len(ps)==1 or ps[1]=="":
- newlist[ps[0]]=resource+i
- else:
- if not newlist.has_key(ps[0]):
- newlist[ps[0]]={}
-
- newlist[ps[0]][ps[1]]=resource+i
-
- if ps[1]=="README":
- buf=zf.read(i)
- buf=string.join(string.split(buf,"\n"),"<BR>\n")
- newlist[ps[0]][ps[1]]=buf
-
- navi=buildNavigationfile(newlist,host,1)
- return cStringIO.StringIO(navi)
-
-
- #
- # Dynamically import a python module
- #
- import string
-
- def dyn_import(name):
- try:
- mod = __import__(name)
- components = string.split(name, '.')
- for comp in components[1:]:
- mod = getattr(mod, comp)
- return mod
- except AttributeError, mesg:
- raise ImportError, mesg
-
-
- # very simple lineWrap
- def lineWrap(message,maxWidth):
- text = ""
-
- temptext = string.strip(str(message))
-
- for strings in string.split(temptext,"\n"):
- while len(strings) > maxWidth:
- index = 0
- for sep in [' ',',',':']:
- ind = string.rfind(strings,sep,0,maxWidth-1)+1
- if ind > index: index = ind
-
- if index > maxWidth:
- index = maxWidth-1
-
- text += "%s\n" % strings[:index]
- strings = strings[index:]
-
- text += "%s\n" % strings
-
- return text
-
-
-
- # Try to turn a resource into a valid URI
- # (because C:\ confuses some tools)
- def urlize (resource):
- if not resource.find(':'):
- return 'file://%s' % resource
- else:
- drive = os.path.splitdrive(resource)
- if len(drive[0]) and drive[0] == resource[:len(drive[0])]:
- return 'file://%s' % resource
- else:
- return resource
-
--- 55,57 ----
Index: gnue/common/src/commdrivers/_helpers/RpcDoc.py
diff -c gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.5
gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.6
*** gnue/common/src/commdrivers/_helpers/RpcDoc.py:1.5 Mon May 13 13:30:18 2002
--- gnue/common/src/commdrivers/_helpers/RpcDoc.py Tue Sep 17 11:27:45 2002
***************
*** 33,39 ****
import sys, string
! from gnue.common import dyn_import
def run (interface, command, *arguments):
--- 33,39 ----
import sys, string
! from gnue.common.FileUtils import dyn_import
def run (interface, command, *arguments):
Index: gnue/common/src/commdrivers/_test/server.py
diff -c gnue/common/src/commdrivers/_test/server.py:1.12
gnue/common/src/commdrivers/_test/server.py:1.13
*** gnue/common/src/commdrivers/_test/server.py:1.12 Mon May 6 13:00:33 2002
--- gnue/common/src/commdrivers/_test/server.py Tue Sep 17 11:27:45 2002
***************
*** 62,68 ****
# Expose our stuff via GNUe RPC
################################################
! from gnue.common import GComm, openResource
from gnue.common.GServerApp import GServerApp
import time
--- 62,69 ----
# Expose our stuff via GNUe RPC
################################################
! from gnue.common import GComm
! from gnue.common.FileUtils import openResource
from gnue.common.GServerApp import GServerApp
import time
Index: gnue/common/src/dbdrivers/mxodbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.4
gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/mxodbc/DBdriver.py:1.4 Wed May 29 23:11:03 2002
--- gnue/common/src/dbdrivers/mxodbc/DBdriver.py Tue Sep 17 11:27:45 2002
***************
*** 38,44 ****
import sys, string
! from gnue.common import GDebug, GDataObjects, GConnections, dyn_import
from gnue.common.dbdrivers._dbsig.DBdriver \
import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
DBSIG_DataObject_SQL, DBSIG_DataObject_Object
--- 38,45 ----
import sys, string
! from gnue.common import GDebug, GDataObjects, GConnections
! from gnue.common.FileUtils import dyn_import
from gnue.common.dbdrivers._dbsig.DBdriver \
import DBSIG_RecordSet, DBSIG_ResultSet, DBSIG_DataObject, \
DBSIG_DataObject_SQL, DBSIG_DataObject_Object
Index: gnue/designer/src/Designer.py
diff -c gnue/designer/src/Designer.py:1.50 gnue/designer/src/Designer.py:1.51
*** gnue/designer/src/Designer.py:1.50 Mon Jul 22 14:38:41 2002
--- gnue/designer/src/Designer.py Tue Sep 17 11:27:45 2002
***************
*** 60,66 ****
from StringIO import StringIO
from wxPython.wx import *
from gnue.common.GClientApp import GClientApp
! from gnue.common import GDebug, dyn_import
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
--- 60,67 ----
from StringIO import StringIO
from wxPython.wx import *
from gnue.common.GClientApp import GClientApp
! from gnue.common import GDebug
! from gnue.common.FileUtils import dyn_import
from gnue.designer import VERSION, PACKAGE
from ToolSupport import SupportedTools
import TemplateParser, TemplateChooser, MRUManager
Index: gnue/designer/src/Instance.py
diff -c gnue/designer/src/Instance.py:1.63 gnue/designer/src/Instance.py:1.64
*** gnue/designer/src/Instance.py:1.63 Sat Sep 7 10:59:16 2002
--- gnue/designer/src/Instance.py Tue Sep 17 11:27:45 2002
***************
*** 30,36 ****
from wxPython.wx import *
from gnue.common import GDebug
from MenuBar import MainMenuBar
! from gnue.common import RuntimeSettings,dyn_import
from ToolFrame import ToolFrame
from gnue.designer import VERSION, PACKAGE
from gnue.designer.Debugger import DebugSession
--- 30,37 ----
from wxPython.wx import *
from gnue.common import GDebug
from MenuBar import MainMenuBar
! from gnue.common import RuntimeSettings
! from gnue.common.FileUtils import dyn_import
from ToolFrame import ToolFrame
from gnue.designer import VERSION, PACKAGE
from gnue.designer.Debugger import DebugSession
Index: gnue/designer/src/TemplateParser.py
diff -c gnue/designer/src/TemplateParser.py:1.18
gnue/designer/src/TemplateParser.py:1.19
*** gnue/designer/src/TemplateParser.py:1.18 Wed Aug 21 18:55:16 2002
--- gnue/designer/src/TemplateParser.py Tue Sep 17 11:27:45 2002
***************
*** 28,34 ****
from wxPython.wx import *
from gnue.designer import TemplateBase
! from gnue.common import dyn_import
class TemplateParser:
def __init__(self, instance, rootObject, parent,
--- 28,34 ----
from wxPython.wx import *
from gnue.designer import TemplateBase
! from gnue.common.FileUtils import dyn_import
class TemplateParser:
def __init__(self, instance, rootObject, parent,
Index: gnue/designer/src/ToolSupport.py
diff -c gnue/designer/src/ToolSupport.py:1.7
gnue/designer/src/ToolSupport.py:1.8
*** gnue/designer/src/ToolSupport.py:1.7 Tue Jul 23 13:52:51 2002
--- gnue/designer/src/ToolSupport.py Tue Sep 17 11:27:45 2002
***************
*** 27,33 ****
#
! from gnue.common import GDebug as _GDebug, dyn_import
SupportedTools = []
UnsupportedTools = []
--- 27,34 ----
#
! from gnue.common import GDebug as _GDebug
! from gnue.common.FileUtils import dyn_import
SupportedTools = []
UnsupportedTools = []
Index: gnue/designer/templates/__init__.py
diff -c gnue/designer/templates/__init__.py:1.8
gnue/designer/templates/__init__.py:1.9
*** gnue/designer/templates/__init__.py:1.8 Fri Jul 19 19:21:12 2002
--- gnue/designer/templates/__init__.py Tue Sep 17 11:27:45 2002
***************
*** 28,34 ****
#
import os, string, dircache
! from gnue.common import dyn_import
#################################################################
#
--- 28,34 ----
#
import os, string, dircache
! from gnue.common.FileUtils import dyn_import
#################################################################
#
Index: gnue/forms/src/GFClient.py
diff -c gnue/forms/src/GFClient.py:1.48 gnue/forms/src/GFClient.py:1.49
*** gnue/forms/src/GFClient.py:1.48 Sun Sep 15 16:54:57 2002
--- gnue/forms/src/GFClient.py Tue Sep 17 11:27:45 2002
***************
*** 42,48 ****
from gnue.forms.GFParser import loadForm
from gnue.forms import GFKeyMapper
from gnue.common import GDebug
! from gnue.common import GConfig, GDataObjects, GConnections, dyn_import
from gnue.forms import VERSION
from gnue.forms.GFConfig import ConfigOptions
--- 42,49 ----
from gnue.forms.GFParser import loadForm
from gnue.forms import GFKeyMapper
from gnue.common import GDebug
! from gnue.common import GConfig, GDataObjects, GConnections
! from gnue.common.FileUtils import dyn_import
from gnue.forms import VERSION
from gnue.forms.GFConfig import ConfigOptions
Index: gnue/forms/src/GFForm.py
diff -c gnue/forms/src/GFForm.py:1.173 gnue/forms/src/GFForm.py:1.174
*** gnue/forms/src/GFForm.py:1.173 Mon Sep 16 16:18:24 2002
--- gnue/forms/src/GFForm.py Tue Sep 17 11:27:45 2002
***************
*** 32,38 ****
import string
import traceback
! from gnue.common import GDebug, openResource, GConnections
from GFObjects import *
from GFEvent import *
from gnue.common.GDataObjects import ConnectionError as DBError
--- 32,39 ----
import string
import traceback
! from gnue.common import GDebug, GConnections
! from gnue.common.FileUtils import openResource
from GFObjects import *
from GFEvent import *
from gnue.common.GDataObjects import ConnectionError as DBError
Index: gnue/forms/src/GFKeyMapper.py
diff -c gnue/forms/src/GFKeyMapper.py:1.9 gnue/forms/src/GFKeyMapper.py:1.10
*** gnue/forms/src/GFKeyMapper.py:1.9 Mon Jul 1 20:32:47 2002
--- gnue/forms/src/GFKeyMapper.py Tue Sep 17 11:27:45 2002
***************
*** 1,6 ****
#
- # Copyright 2002 Free Software Foundation
- #
# This file is part of GNU Enterprise.
#
# GNU Enterprise is free software; you can redistribute it
--- 1,4 ----
***************
*** 17,22 ****
--- 15,22 ----
# License along with program; see the file COPYING. If not,
# write to the Free Software Foundation, Inc., 59 Temple Place
# - Suite 330, Boston, MA 02111-1307, USA.
+ #
+ # Copyright 2002 Free Software Foundation
#
# FILE:
# GFKeyMapper.py
Index: gnue/forms/src/uidrivers/gtk2/UIdriver.py
diff -c gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.8
gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.9
*** gnue/forms/src/uidrivers/gtk2/UIdriver.py:1.8 Sun Sep 8 11:41:36 2002
--- gnue/forms/src/uidrivers/gtk2/UIdriver.py Tue Sep 17 11:27:45 2002
***************
*** 74,80 ****
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common import lineWrap
_NOTEBOOK = None
_LOOPTRAP = 0
--- 74,80 ----
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common.TextUtils import lineWrap
_NOTEBOOK = None
_LOOPTRAP = 0
Index: gnue/forms/src/uidrivers/nstti/UIdriver.py
diff -c gnue/forms/src/uidrivers/nstti/UIdriver.py:1.4
gnue/forms/src/uidrivers/nstti/UIdriver.py:1.5
*** gnue/forms/src/uidrivers/nstti/UIdriver.py:1.4 Mon Jun 17 20:18:16 2002
--- gnue/forms/src/uidrivers/nstti/UIdriver.py Tue Sep 17 11:27:45 2002
***************
*** 45,51 ****
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common import lineWrap
_NOTEBOOK = None
_LOOPTRAP = 0
--- 45,51 ----
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common.TextUtils import lineWrap
_NOTEBOOK = None
_LOOPTRAP = 0
Index: gnue/forms/src/uidrivers/wx/UIdriver.py
diff -c gnue/forms/src/uidrivers/wx/UIdriver.py:1.185
gnue/forms/src/uidrivers/wx/UIdriver.py:1.186
*** gnue/forms/src/uidrivers/wx/UIdriver.py:1.185 Sat Sep 14 16:15:02 2002
--- gnue/forms/src/uidrivers/wx/UIdriver.py Tue Sep 17 11:27:45 2002
***************
*** 42,48 ****
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common import lineWrap
_LOOPTRAP = 0
_PROMPTFORRECORD = None
--- 42,48 ----
from gnue.forms import VERSION
from gnue.common import GDebug, GLoginHandler
from gnue.common import GConfig
! from gnue.common.TextUtils import lineWrap
_LOOPTRAP = 0
_PROMPTFORRECORD = None
Index: gnue/navigator/src/GNClient.py
diff -c gnue/navigator/src/GNClient.py:1.13 gnue/navigator/src/GNClient.py:1.14
*** gnue/navigator/src/GNClient.py:1.13 Mon Jun 10 19:42:38 2002
--- gnue/navigator/src/GNClient.py Tue Sep 17 11:27:45 2002
***************
*** 36,42 ****
from gnue.navigator.GNParser import loadProcesses
from gnue.navigator import Actions
! from gnue.common import GDebug, openResource
from gnue.common import GDataObjects, GConnections
from gnue.common.GClientApp import *
from gnue.navigator import VERSION
--- 36,43 ----
from gnue.navigator.GNParser import loadProcesses
from gnue.navigator import Actions
! from gnue.common import GDebug
! from gnue.common.FileUtils import openResource
from gnue.common import GDataObjects, GConnections
from gnue.common.GClientApp import *
from gnue.navigator import VERSION
Index: gnue/navigator/src/UIwxpython.py
diff -c gnue/navigator/src/UIwxpython.py:1.19
gnue/navigator/src/UIwxpython.py:1.20
*** gnue/navigator/src/UIwxpython.py:1.19 Mon Jul 1 19:09:14 2002
--- gnue/navigator/src/UIwxpython.py Tue Sep 17 11:27:45 2002
***************
*** 33,39 ****
from wxPython.html import *
from time import sleep
import os, sys, string
! from gnue.common import GDataObjects, GConnections, dyn_import, openResource
from gnue.common import GConfig
try:
--- 33,40 ----
from wxPython.html import *
from time import sleep
import os, sys, string
! from gnue.common import GDataObjects, GConnections
! from gnue.common.FileUtils import dyn_import, openResource
from gnue.common import GConfig
try:
Index: gnue/reports/adapters/filters/sablotron/Adapter.py
diff -c gnue/reports/adapters/filters/sablotron/Adapter.py:1.7
gnue/reports/adapters/filters/sablotron/Adapter.py:1.8
*** gnue/reports/adapters/filters/sablotron/Adapter.py:1.7 Wed Sep 11
13:45:15 2002
--- gnue/reports/adapters/filters/sablotron/Adapter.py Tue Sep 17 11:27:45 2002
***************
*** 38,44 ****
from gnue.reports.GROutputAdapter import TransformAdapter as Base
! from gnue.common import urlize
class TransformAdapter(Base):
--- 38,44 ----
from gnue.reports.GROutputAdapter import TransformAdapter as Base
! from gnue.common.FileUtils import urlize
class TransformAdapter(Base):
Index: gnue/reports/src/GREngine.py
diff -c gnue/reports/src/GREngine.py:1.15 gnue/reports/src/GREngine.py:1.16
*** gnue/reports/src/GREngine.py:1.15 Mon Sep 16 15:30:16 2002
--- gnue/reports/src/GREngine.py Tue Sep 17 11:27:45 2002
***************
*** 35,41 ****
import GRParser
import GRExceptions
import GRFilters
! from gnue.common import openResource, GDebug, dyn_import
class GREngine:
--- 35,42 ----
import GRParser
import GRExceptions
import GRFilters
! from gnue.common import GDebug
! from gnue.common.FileUtils import openResource, dyn_import
class GREngine:
Index: gnue/reports/src/GRFilters.py
diff -c gnue/reports/src/GRFilters.py:1.12 gnue/reports/src/GRFilters.py:1.13
*** gnue/reports/src/GRFilters.py:1.12 Tue May 14 20:27:39 2002
--- gnue/reports/src/GRFilters.py Tue Sep 17 11:27:45 2002
***************
*** 27,33 ****
# NOTES:
#
! from gnue.common import GConfig, GDebug, openResource, dyn_import
from ConfigParser import *
import os, sys, string
--- 27,34 ----
# NOTES:
#
! from gnue.common import GConfig, GDebug,
! from gnue.common.FileUtils import openResource, dyn_import
from ConfigParser import *
import os, sys, string
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue appserver/src/geasRpcServer.py appserver/s...,
Jason Cater <=