Author: reinhard
Date: 2009-10-06 09:40:52 -0500 (Tue, 06 Oct 2009)
New Revision: 9938
Modified:
trunk/gnue-common/src/__init__.py
trunk/gnue-common/src/apps/GBaseApp.py
trunk/gnue-common/src/apps/GClientApp.py
trunk/gnue-common/src/apps/GConfig.py
trunk/gnue-common/src/apps/__init__.py
trunk/gnue-common/src/datasources/ConnectionTriggerObj.py
trunk/gnue-common/src/datasources/Exceptions.py
trunk/gnue-common/src/datasources/GConditions.py
trunk/gnue-common/src/datasources/GConnections.py
trunk/gnue-common/src/datasources/GDataSource.py
trunk/gnue-common/src/datasources/GLoginHandler.py
trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
trunk/gnue-common/src/datasources/drivers/file/inifile.py
trunk/gnue-common/src/datasources/drivers/other/appserver.py
trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py
trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
trunk/gnue-common/src/datasources/readgsd.py
trunk/gnue-common/src/definitions/GBinary.py
trunk/gnue-common/src/definitions/GObjects.py
trunk/gnue-common/src/definitions/GParser.py
trunk/gnue-common/src/definitions/GParserHelpers.py
trunk/gnue-common/src/events/EventController.py
trunk/gnue-common/src/formatting/GTypecast.py
trunk/gnue-common/src/logic/GTrigger.py
trunk/gnue-common/src/logic/GTriggerCore.py
trunk/gnue-common/src/logic/adapters/ecmascript.py
trunk/gnue-common/src/logic/language.py
trunk/gnue-common/src/rpc/drivers/Base.py
trunk/gnue-common/src/rpc/drivers/hessian/ClientAdapter.py
trunk/gnue-common/src/rpc/drivers/hessian/ServerAdapter.py
trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
trunk/gnue-common/src/utils/datatypes.py
trunk/gnue-common/src/utils/http.py
trunk/gnue-common/src/utils/uuid.py
Log:
Use new features in gnue.common.base throughout gnue-common.
Modified: trunk/gnue-common/src/__init__.py
===================================================================
--- trunk/gnue-common/src/__init__.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/__init__.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -25,7 +25,7 @@
of the modules can also be used outside GNUe.
"""
-from utils.version import Version
+from gnue.common.base import version
try:
import svnrev
@@ -33,7 +33,7 @@
except ImportError:
__svn_revision__ = None
-__version__ = Version(0, 7, 'alpha', 0, __svn_revision__)
+__version__ = version.Version(0, 7, 'alpha', 0, __svn_revision__)
PACKAGE = "GNUe-Common"
TITLE = "GNUe Common Library"
Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/apps/GBaseApp.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -40,7 +40,8 @@
from gnue import paths
from gnue.common.base import errors, log
-from gnue.common.apps.i18n import utranslate as u_
+from gnue.common.base.i18n import utranslate as u_
+
from gnue.common.apps import GConfig, GDebug
from gnue.common.datasources import GConnections
from gnue.common.apps.CommandOption import CommandOption
Modified: trunk/gnue-common/src/apps/GClientApp.py
===================================================================
--- trunk/gnue-common/src/apps/GClientApp.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/apps/GClientApp.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -30,8 +30,9 @@
# CORBA, RPC-XML, SOAP, etc.
#
+from gnue.common.base import errors
+
from gnue.common.apps.GBaseApp import GBaseApp
-from gnue.common.apps import errors
class StartupError (errors.UserError):
pass
Modified: trunk/gnue-common/src/apps/GConfig.py
===================================================================
--- trunk/gnue-common/src/apps/GConfig.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/apps/GConfig.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -30,7 +30,7 @@
import ConfigParser
from gnue import paths
-from gnue.common.base import errors, i18n
+from gnue.common.base import errors, i18n, log
from gnue.common import GCConfig
@@ -122,7 +122,7 @@
this error will indicate why.
"""
- assert gDebug(2, 'Reading configuration info from %s section %s' %
+ assert log.debug('Reading configuration info from %s section %s' %
(config_filename, section))
# Create parser and populate it if it doesn't exist
@@ -158,8 +158,7 @@
# Load the values from the files specified
try:
parser.read(file_locations)
- assert gDebug(2, \
- 'Configuration files were read in this order: %s' % \
+ assert log.debug('Configuration files were read in this order: %s' % \
file_locations)
except ConfigParser.DuplicateSectionError:
Modified: trunk/gnue-common/src/apps/__init__.py
===================================================================
--- trunk/gnue-common/src/apps/__init__.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/apps/__init__.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,4 +27,4 @@
# These modules introduce new functions into the builtins dictionary, so we
# always import them
-from gnue.common.apps import GDebug, errors
+from gnue.common.apps import GDebug
Modified: trunk/gnue-common/src/datasources/ConnectionTriggerObj.py
===================================================================
--- trunk/gnue-common/src/datasources/ConnectionTriggerObj.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/ConnectionTriggerObj.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -28,7 +28,8 @@
import types
-from gnue.common.apps import GDebug
+from gnue.common.base import log
+
from gnue.common.definitions import GObjects
@@ -92,7 +93,7 @@
try:
conn = connections.getConnection(name)
except:
- assert gDebug (1, "Cannot add connection %s to object tree" % name)
+ assert log.debug ("Cannot add connection %s to object tree" % name)
continue
root_object.addChild(ConnectionTriggerObj(conn, name))
@@ -108,6 +109,6 @@
try:
conn = connections.getConnection (name)
except:
- assert gDebug (1,"Cannot add connection %s to trigger namespace" % name)
+ assert log.debug ("Cannot add connection %s to trigger namespace" % name)
continue
gobjNamespace.constructTriggerObject (ConnectionTriggerObj (conn, name))
Modified: trunk/gnue-common/src/datasources/Exceptions.py
===================================================================
--- trunk/gnue-common/src/datasources/Exceptions.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/Exceptions.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -24,7 +24,7 @@
Exceptions used in the database driver system.
"""
-from gnue.common.apps import errors
+from gnue.common.base import errors
from gnue.common.utils import TextUtils
Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/GConditions.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -30,7 +30,8 @@
if sys.hexversion >= 0x02040000:
import decimal
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.definitions import GObjects
from gnue.common.formatting import GTypecast
from gnue.common.utils import GDateTime
Modified: trunk/gnue-common/src/datasources/GConnections.py
===================================================================
--- trunk/gnue-common/src/datasources/GConnections.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/GConnections.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,10 +27,11 @@
from ConfigParser import *
from ConfigParser import RawConfigParser # is not in __all__
-import copy, netrc
+import copy
+import locale
+import netrc
-from gnue.common.base import errors, plugin
-from gnue.common.apps import i18n
+from gnue.common.base import errors, log, plugin
from gnue.common.utils.FileUtils import openResource, dyn_import
from gnue.common.datasources import Exceptions, GLoginHandler
@@ -377,7 +378,7 @@
if not connected:
loginData = connection.parameters
- loginData ['_language'] = i18n.getuserlocale ()
+ loginData ['_language'] = locale.getlocale()[0]
try:
# load the user's netrc file:
@@ -393,11 +394,11 @@
netrcData = netrc.netrc ().authenticators ("'gnue://%s/'" \
% connection_base)
if netrcData is not None:
- assert gDebug (7, 'Read the user\'s .netrc file')
+ assert log.debug ('Read the user\'s .netrc file')
loginData ['_username'] = netrcData [0][1:-1]
loginData ['_password'] = netrcData [2][1:-1]
- assert gDebug (7, "Found useful stuff for connection %s in "
+ assert log.debug ("Found useful stuff for connection %s in "
"the user\'s .netrc file" % connection_name)
except (IOError, netrc.NetrcParseError, KeyError):
@@ -467,7 +468,7 @@
attempts = 4
- assert gDebug (7, 'Getting new data connection to %s' % connection_name)
+ assert log.debug ('Getting new data connection to %s' % connection_name)
errortext = None
Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/GDataSource.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -26,7 +26,8 @@
import cStringIO
-from gnue.common.apps import errors
+from gnue.common.base import errors, log
+
from gnue.common.definitions import GObjects, GParser, GParserHelpers
from gnue.common import events
from gnue.common.formatting import GTypecast
@@ -491,7 +492,7 @@
"""
if self.type == 'unbound':
- assert gDebug (1, "Trying to bind field %s to unbound DataSource" % field)
+ assert log.debug ("Trying to bind field %s to unbound DataSource" % field)
return
self.__fieldReferences [field] = True
@@ -537,7 +538,7 @@
@param defaultValue: optional default value for newly inserted records.
"""
- assert gDebug (7,'Unbound Field %s implicitly referenced' % field)
+ assert log.debug ('Unbound Field %s implicitly referenced' % field)
if defaultValue != None:
self.__defaultData [field] = defaultValue
@@ -824,7 +825,7 @@
# If it's a string or a unicode string, we transform it into a tuple
# sequence, where all items are treated to be in 'ascending' order
if isinstance (order_by, basestring):
- assert gDebug (1, "DEPRECIATION WARNING: use of 'order_by' attribute is " \
+ assert log.debug ("DEPRECIATION WARNING: use of 'order_by' attribute is " \
"depreciated. Please use <sortorder> instead.")
for field in order_by.split (','):
(item, desc) = (field, field [-5:].lower () == ' desc')
Modified: trunk/gnue-common/src/datasources/GLoginHandler.py
===================================================================
--- trunk/gnue-common/src/datasources/GLoginHandler.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/GLoginHandler.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -28,7 +28,7 @@
import getpass
-from gnue.common.apps import errors
+from gnue.common.base import errors
# =============================================================================
Modified: trunk/gnue-common/src/datasources/drivers/Base/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/Base/Behavior.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,7 +27,8 @@
__all__ = ['MissingTypeTransformationError', 'Behavior']
-from gnue.common.apps import errors
+from gnue.common.base import errors, log
+
from gnue.common.datasources import GSchema
@@ -128,9 +129,7 @@
Create a new database specified by the associated connection.
"""
- assert gEnter (8)
self._createDatabase_ ()
- assert gLeave (8)
# ---------------------------------------------------------------------------
@@ -152,8 +151,6 @@
checktype (schema, GSchema.GSSchema)
- assert gEnter (8)
-
self._current = self.readSchema ()
self._diff = self._current.diff (schema, self._maxIdLength_)
self._new = schema
@@ -161,16 +158,13 @@
self._lookups = self.__getLookups (self._current)
self._elements = {}
- assert gDebug (8, "Necessary schema changes:")
- assert gDebug (8, self._diff.dumpXML ())
+ assert log.debug ("Necessary schema changes:")
+ assert log.debug (self._diff.dumpXML ())
- result = self._writeSchema_ (self._current, self._new, self._diff,
+ return self._writeSchema_ (self._current, self._new, self._diff,
simulation)
- assert gLeave (8, result)
- return result
-
# ---------------------------------------------------------------------------
# Read schema information from connection and return it as GSchema tree
# ---------------------------------------------------------------------------
@@ -183,8 +177,6 @@
@return: current schema as L{GSchema} object tree.
"""
- assert gEnter (8)
-
result = GSchema.GSSchema ()
author = self.__module__.replace ('gnue.common.datasources.drivers.', '')
title = u_("DB-Export of %s") % self.__connection.name
@@ -192,7 +184,6 @@
self._readSchema_ (result)
- assert gLeave (8, result)
return result
Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,6 +27,8 @@
__all__ = ['ResultSet']
+from gnue.common.base import log
+
from gnue.common.datasources import Exceptions
from RecordSet import RecordSet
@@ -585,7 +587,7 @@
if self.__readonly:
raise Exceptions.ReadOnlyInsertError
- assert gDebug(8, 'Inserting a blank record in %s' % self)
+ assert log.debug('Inserting a blank record in %s' % self)
self.__record_count += 1
self.__current_index += 1
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -31,7 +31,7 @@
import sys
from gnue.common.base import log
-from gnue.common.apps import errors, GDebug
+
from gnue.common.datasources import Exceptions
from gnue.common.datasources.drivers import Base
Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/ResultSet.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,7 +27,8 @@
__all__ = ['ResultSet']
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.datasources.drivers import Base
Modified: trunk/gnue-common/src/datasources/drivers/file/inifile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/inifile.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/file/inifile.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,7 +29,8 @@
import ConfigParser
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.datasources import GSchema
from gnue.common.datasources.drivers.file import Base
Modified: trunk/gnue-common/src/datasources/drivers/other/appserver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/other/appserver.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/other/appserver.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,9 +27,10 @@
__all__ = ['DriverInfo', 'Behavior', 'ResultSet', 'Connection']
-import sys
+import locale
-from gnue.common.apps import errors, i18n
+from gnue.common.base import errors
+
from gnue.common.rpc import client
from gnue.common.datasources import Exceptions, GSchema
from gnue.common.datasources.drivers import Base
@@ -334,7 +335,7 @@
(u_('Password'), '_password', 'password', None, None, [])])
self.__getSessionManager ()
- self.__filters = self._sm.getFilters (i18n.getuserlocale ())
+ self.__filters = self._sm.getFilters (locale.getlocale()[0])
for item in self.__filters:
(filterId, filterLabel) = item [0]
Modified: trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/interbase/kinterbasdbdrv.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -28,6 +28,8 @@
__all__ = ['Connection']
+from gnue.common.base import log
+
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sql.interbase import Behavior
@@ -129,7 +131,7 @@
self._ib_encoding = ib_encTable [self._encoding]
else:
self._ib_encoding = ''
- assert gDebug (1, "Encoding '%s' is not supported by interbase dbdriver. "
+ assert log.debug ("Encoding '%s' is not supported by interbase dbdriver. "
"Using default encoding." % self._encoding)
Modified: trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/maxdb/Behavior.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,7 +27,7 @@
__all__ = ['Behavior']
-from gnue.common.apps import errors
+from gnue.common.base import errors
from gnue.common.datasources import GLoginHandler, GSchema
from gnue.common.datasources.drivers import DBSIG2
Modified: trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/mysql/mysqldbdrv.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,6 +27,8 @@
__all__ = ['Connection']
+from gnue.common.base import log
+
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sql.mysql import Behavior
@@ -150,7 +152,7 @@
kwargs ['init_command'] = ('SET NAMES %s' % my_enc)
else:
- assert gDebug (1, "Encoding '%s' is not supported by mysql dbdriver. "
+ assert log.debug ("Encoding '%s' is not supported by mysql dbdriver. "
"Using default encoding." % self._encoding)
return ([], kwargs)
Modified: trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/oracle/Base.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -30,8 +30,9 @@
__noplugin__ = True
import os
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sql.oracle import Behavior
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/Base.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,6 +29,8 @@
__noplugin__ = True
+from gnue.common.base import log
+
from gnue.common.datasources.drivers import DBSIG2
from gnue.common.datasources.drivers.sql.postgresql import Behavior
@@ -65,7 +67,7 @@
self._pg_encoding = pg_encTable [self._encoding]
else:
self._pg_encoding = ''
- assert gDebug (1, "Encoding '%s' is not supported by postgresql dbdriver. "
+ assert log.debug ("Encoding '%s' is not supported by postgresql dbdriver. "
"Using default encoding." % self._encoding)
Modified: trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/postgresql/Behavior.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,7 +29,6 @@
import os
-from gnue.common.apps import errors
from gnue.common.datasources import GSchema
from gnue.common.datasources.drivers import DBSIG2
Modified: trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/drivers/sql/sqlite2/Behavior.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,7 +29,7 @@
import re
-from gnue.common.apps import errors
+from gnue.common.base import errors
from gnue.common.datasources import GSchema
from gnue.common.datasources.drivers import DBSIG2
Modified: trunk/gnue-common/src/datasources/readgsd.py
===================================================================
--- trunk/gnue-common/src/datasources/readgsd.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/datasources/readgsd.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,11 +29,13 @@
import sets
import datetime
-from gnue.common.apps import errors, GBaseApp, GClientApp
+from gnue.common.base import errors
+from gnue.common.base.i18n import utranslate as u_ # for epydoc
+
+from gnue.common.apps import GBaseApp, GClientApp
from gnue.common.datasources import GSchema, GDataSource, GConditions
from gnue.common.utils.FileUtils import openResource
from gnue.common.utils import GDateTime
-from gnue.common.apps.i18n import utranslate as u_ # for epydoc
# =============================================================================
Modified: trunk/gnue-common/src/definitions/GBinary.py
===================================================================
--- trunk/gnue-common/src/definitions/GBinary.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/definitions/GBinary.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,7 +29,8 @@
import base64
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.definitions.GObjects import GObj
Modified: trunk/gnue-common/src/definitions/GObjects.py
===================================================================
--- trunk/gnue-common/src/definitions/GObjects.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/definitions/GObjects.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -28,6 +28,9 @@
__all__ = ['GObj', 'GUndividedCollection']
from xml.sax import saxutils
+
+from gnue.common.base import log
+
from gnue.common.definitions.GParserHelpers import GContent, ParserObj
from gnue.common.formatting import GTypecast
from gnue.common.logic.GTriggerCore import GTriggerCore
@@ -331,7 +334,7 @@
inits = self._inits
if (len (inits) > phase) and inits [phase]:
- assert gDebug (7,"%s: Init Phase %s" % (self._type, phase+1))
+ assert log.debug ("%s: Init Phase %s" % (self._type, phase+1))
inits [phase] ()
for child in self._children:
Modified: trunk/gnue-common/src/definitions/GParser.py
===================================================================
--- trunk/gnue-common/src/definitions/GParser.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/definitions/GParser.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -29,6 +29,9 @@
'xmlHandler', 'GImportItem', 'GImport']
import sys, copy, types
+
+from gnue.common.base import log
+
from gnue.common.definitions.GObjects import GObj
from gnue.common.definitions.GRootObj import GRootObj
from gnue.common.utils.FileUtils import openResource, dyn_import
@@ -52,7 +55,8 @@
import os
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.formatting import GTypecast
from gnue.common.definitions.GParserHelpers import GContent, GComment
@@ -169,7 +173,7 @@
dh.finalValidation ()
if initialize:
- assert gDebug (7, "Initializing the object tree starting at %s" % (object))
+ assert log.debug ("Initializing the object tree starting at %s" % (object))
object.phaseInit (dh._phaseInitCount)
# Break the cyclic reference in the content handler, so garbage collection is
@@ -343,14 +347,14 @@
except:
self.doImportLayoutParser = False
- assert gDebug (7, "No parser defined for namespace %s, " \
+ assert log.debug ("No parser defined for namespace %s, " \
"using PassThru objects." % ns)
if not ns or ns == self.default_namespace:
#
# No namespace qualifier
#
- assert gDebug (7, "<%s>" % tname)
+ assert log.debug ("<%s>" % tname)
# Check whether this tag is valid at all
if not self.xmlElements.has_key (tname):
@@ -419,7 +423,7 @@
# FIXME: This should raise an exception. Only issue a warning
# for now to stay compatible with earlier versions that didn't
# check this at all.
- assert gDebug(1,
+ assert log.debug(
"DEPRECATION WARNING: %s not a valid value for %s.%s" \
% (attrvalue, tname, attr))
#raise InvalidValueSetError (item, object,
@@ -488,7 +492,7 @@
#
# namespace qualifier and we are masquerading
#
- assert gDebug (7, "<%s:%s>" % (ns, tname))
+ assert log.debug ("<%s:%s>" % (ns, tname))
for qattr in attrs.keys ():
attrns, attr = qattr
@@ -617,7 +621,7 @@
self._phaseInitCount = (inits != None and inits > self._phaseInitCount \
and inits or self._phaseInitCount)
- assert gDebug (7, "</%s>" % tname)
+ assert log.debug ("</%s>" % tname)
# ---------------------------------------------------------------------------
# Virtual functions
@@ -741,7 +745,7 @@
# transfer attributes reassigned during the import
for key in [k for k in self._loadedxmlattrs.keys () if k [0] != '_']:
rv.__dict__ [key] = self._loadedxmlattrs [key]
- assert gDebug (7, ">>> Moving %s" % key)
+ assert log.debug (">>> Moving %s" % key)
return rv
Modified: trunk/gnue-common/src/definitions/GParserHelpers.py
===================================================================
--- trunk/gnue-common/src/definitions/GParserHelpers.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/definitions/GParserHelpers.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -26,8 +26,9 @@
"""
from xml.sax import saxutils
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
__all__ = ['ParserObj', 'GLeafNode', 'GContent', 'GComment']
Modified: trunk/gnue-common/src/events/EventController.py
===================================================================
--- trunk/gnue-common/src/events/EventController.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/events/EventController.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -25,6 +25,8 @@
Class for event dispatching.
"""
+from gnue.common.base import log
+
from gnue.common.events import Event
__all__ = ['EventController']
@@ -131,7 +133,7 @@
@returns: the event object's __result__ attribute
"""
- assert gDebug(8, event)
+ assert log.debug(event)
if self.__caching:
self.__cache.append((event, args, kwargs))
Modified: trunk/gnue-common/src/formatting/GTypecast.py
===================================================================
--- trunk/gnue-common/src/formatting/GTypecast.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/formatting/GTypecast.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -33,7 +33,7 @@
import string
from types import UnicodeType
-from gnue.common.apps import errors
+from gnue.common.base import errors
# Raised if a value cannot be typecasted
class TypecastError (errors.UserError):
Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/logic/GTrigger.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -21,7 +21,8 @@
#
# $Id$
-from gnue.common.apps import errors
+from gnue.common.base import errors, log
+
from gnue.common.formatting import GTypecast
from gnue.common.logic.usercode import UserCode
@@ -223,7 +224,7 @@
if not key in self._validTriggers.keys():
raise InvalidTriggerFiredError, (key, self)
- assert gDebug (9, 'Trigger %s on %s' % (key, repr(self)))
+ assert log.debug ('Trigger %s on %s' % (key, repr(self)))
result = None
if self.__triggers.has_key(key):
for function in self.__triggers[key]:
Modified: trunk/gnue-common/src/logic/GTriggerCore.py
===================================================================
--- trunk/gnue-common/src/logic/GTriggerCore.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/logic/GTriggerCore.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,7 +27,7 @@
import types
-from gnue.common.apps import errors
+from gnue.common.base import errors
__all__ = ['GTriggerCore']
Modified: trunk/gnue-common/src/logic/adapters/ecmascript.py
===================================================================
--- trunk/gnue-common/src/logic/adapters/ecmascript.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/logic/adapters/ecmascript.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -31,8 +31,8 @@
import types
import string
-from gnue.common.apps import GDebug
-from gnue.common.apps import errors
+from gnue.common.base import errors, log
+
from gnue.common.logic import language
from gnue.common.logic.adapters import Base
from gnue.common.logic.NamespaceCore import NamespaceElement
@@ -109,7 +109,7 @@
self._hname, param,
self._name,param)
- assert gDebug(8, "Adding code to ECMAscript namespace :'%s'" % self._realcode)
+ assert log.debug("Adding code to ECMAscript namespace :'%s'" % self._realcode)
# load code into context
try:
self._cx.eval_script(self._realcode)
@@ -164,7 +164,7 @@
self._realcode = '%s = function (%s) {%s};' % (self._name, param,
self._code);
- assert gDebug(8, "Adding code to ECMAscript namespace :'%s'" % self._realcode)
+ assert log.debug("Adding code to ECMAscript namespace :'%s'" % self._realcode)
# load code into context
try:
self._cx.eval_script(self._realcode)
Modified: trunk/gnue-common/src/logic/language.py
===================================================================
--- trunk/gnue-common/src/logic/language.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/logic/language.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -34,7 +34,7 @@
are used to execute user provided code in GNUe applications.
"""
-from gnue.common.apps import errors
+from gnue.common.base import errors
from gnue.common.utils.FileUtils import dyn_import
__all__ = ['AdapterNotFoundError', 'ImplementationError', 'CompileError',
Modified: trunk/gnue-common/src/rpc/drivers/Base.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/Base.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/Base.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -32,7 +32,6 @@
import urlparse
import types
-from gnue.common.apps import i18n
from gnue.common.rpc import server
# Indicate that this is not a valid plugin
@@ -195,10 +194,7 @@
@returns: L{ServerProxy} instance handling attribute access and method calls
"""
- assert gEnter (8)
- result = self._getServerProxy_ ()
- assert gLeave (8, result)
- return result
+ return self._getServerProxy_ ()
# ---------------------------------------------------------------------------
@@ -283,10 +279,7 @@
Note: not all RPC adapter can handle keyword arguments, so take care.
"""
- assert gEnter (8)
- result = self._adapter._callMethod_ (self._methodname, *args, **params)
- assert gLeave (8, result)
- return result
+ return self._adapter._callMethod_ (self._methodname, *args, **params)
# ---------------------------------------------------------------------------
@@ -385,10 +378,7 @@
Start the server.
"""
- assert gEnter (8)
- result = self._serve_ ()
- assert gLeave (8, result)
- return result
+ return self._serve_ ()
# ---------------------------------------------------------------------------
@@ -399,9 +389,7 @@
"""
"""
- assert gEnter (8)
self._shutdown_ ()
- assert gLeave (8)
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/hessian/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/hessian/ClientAdapter.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/hessian/ClientAdapter.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -25,7 +25,8 @@
import socket
import weakref
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.rpc import client
from gnue.common.rpc.drivers import Base
from gnue.common.utils import http
@@ -173,12 +174,9 @@
data-type, or a result cannot be converted into a native python type
"""
- assert gEnter (9)
-
checktype (method, basestring)
if not self._transport:
- assert gLeave (9)
return
__args = tuple ([typeconv.python_to_rpc (arg, self.__unwrapProxy) \
@@ -201,10 +199,8 @@
except socket.error, e:
raise errors.AdminError(unicode(e))
- result = typeconv.rpc_to_python (result, self.__wrapProxy,
+ return typeconv.rpc_to_python (result, self.__wrapProxy,
client.InvalidParameter)
- assert gLeave (9, result)
- return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/hessian/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/hessian/ServerAdapter.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/hessian/ServerAdapter.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -27,13 +27,15 @@
import typeconv
import datetime
-from SimpleHessianServer import SimpleHessianServer
-from gnue.common.base import errors
+from gnue.common.base import errors, log
+
from gnue.common.rpc import server
from gnue.common.rpc.drivers import Base
from gnue.common.utils import http
+from SimpleHessianServer import SimpleHessianServer
+
# =============================================================================
# Exceptions
# =============================================================================
@@ -114,8 +116,6 @@
@returns: result of the method given in RPC types
"""
- assert gEnter (9)
-
checktype (method, basestring)
checktype (parameters, tuple)
@@ -123,9 +123,7 @@
server.InvalidParameter, client)
result = self._tcpServer._dispatch (method, params)
- result = typeconv.python_to_rpc (result, self._updateStore, client)
- assert gLeave (9, result)
- return result
+ return typeconv.python_to_rpc (result, self._updateStore, client)
# ---------------------------------------------------------------------------
@@ -134,10 +132,7 @@
def _call (self, storedObject, method, *parameters):
- assert gEnter (9)
- result = getattr (storedObject, method) (*parameters)
- assert gLeave (9, result)
- return result
+ return getattr (storedObject, method) (*parameters)
# ---------------------------------------------------------------------------
@@ -146,8 +141,6 @@
def _destroy (self, item):
- assert gEnter (9)
-
if hasattr (item, "_destroy"):
item._destroy ()
@@ -161,17 +154,13 @@
if itemId in self._objectPerClient [client]:
del self._objectPerClient [client][itemId]
- assert gLeave (9)
-
# ---------------------------------------------------------------------------
# Add an object to the store or update it's reference
# ---------------------------------------------------------------------------
def _updateStore (self, item, client):
- gEnter (9)
-
# The itemId must be stored as string, because 64 bit numbers cannot be
# transported with hessian
itemId = str (id (item))
@@ -179,8 +168,6 @@
self._objectPerClient.setdefault (client, {}) [itemId] = item
self._clientPerObject [itemId] = client
- assert gLeave (9, result)
-
return result
@@ -204,14 +191,10 @@
def _clearClientObjects (self, client):
- assert gEnter (9)
-
for item in self._objectPerClient.get (client, {}).values ():
self._destroy (item)
- assert gLeave (9)
-
# ---------------------------------------------------------------------------
# Nice string representation
# ---------------------------------------------------------------------------
@@ -253,10 +236,10 @@
def log_request (self, code = '-', size = '-'):
"""
- Log all requests at debug level 9.
+ Log all requests.
"""
- assert gDebug (9, "'%s' %s %s" % (self.requestline, code, size))
+ assert log.debug (9, "'%s' %s %s" % (self.requestline, code, size))
# ---------------------------------------------------------------------------
@@ -351,18 +334,14 @@
to the socket.
"""
- assert gEnter (9)
-
allowed = self.serverAdapter and self.serverAdapter.allowed_hosts
for host in allowed:
if client_address [0][:len (host)] == host:
- assert gLeave (9, True)
return True
request.send ("HTTP/1.1 403 Forbidden\r\n\r\n")
self.close_request (request)
- assert gLeave (9, False)
return False
Modified: trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/pyro/ServerAdapter.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -21,6 +21,8 @@
#
# $Id$
+from gnue.common.base import log
+
from gnue.common.rpc import server
from gnue.common.rpc.drivers import Base
@@ -85,7 +87,7 @@
locator = Pyro.naming.NameServerLocator ()
self._ns = locator.getNS ()
- gDebug (9, "PYRO NameServer found at %s (%s) %s" \
+ log.debug ("PYRO NameServer found at %s (%s) %s" \
% (self._ns.URI.address,
Pyro.protocol.getHostname (self._ns.URI.address) or '??',
self._ns.URI.port))
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ClientAdapter.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -25,7 +25,8 @@
import socket
import weakref
-from gnue.common.apps import errors
+from gnue.common.base import errors
+
from gnue.common.rpc import client
from gnue.common.rpc.drivers import Base
from gnue.common.utils import http
@@ -179,12 +180,9 @@
data-type, or a result cannot be converted into a native python type
"""
- assert gEnter (9)
-
checktype (method, basestring)
if not self._transport:
- assert gLeave (9)
return
__args = tuple ([typeconv.python_to_rpc (arg, self.__unwrapProxy) \
@@ -207,10 +205,8 @@
except socket.error, e:
raise errors.AdminError(unicode(e))
- result = typeconv.rpc_to_python (result, self.__wrapProxy,
+ return typeconv.rpc_to_python (result, self.__wrapProxy,
client.InvalidParameter)
- assert gLeave (9, result)
- return result
# ---------------------------------------------------------------------------
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/ServerAdapter.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -28,7 +28,8 @@
import datetime
from SimpleXMLRPCServer import SimpleXMLRPCServer
-from gnue.common.base import errors
+from gnue.common.base import errors, log
+
from gnue.common.rpc import server
from gnue.common.rpc.drivers import Base
from gnue.common.utils import http
@@ -114,8 +115,6 @@
@returns: result of the method given in RPC types
"""
- assert gEnter (9)
-
checktype (method, basestring)
checktype (parameters, tuple)
@@ -123,9 +122,7 @@
server.InvalidParameter, client)
result = self._tcpServer._dispatch (method, params)
- result = typeconv.python_to_rpc (result, self._updateStore, client)
- assert gLeave (9, result)
- return result
+ return typeconv.python_to_rpc (result, self._updateStore, client)
# ---------------------------------------------------------------------------
@@ -134,10 +131,7 @@
def _call (self, storedObject, method, *parameters):
- assert gEnter (9)
- result = getattr (storedObject, method) (*parameters)
- assert gLeave (9, result)
- return result
+ return getattr (storedObject, method) (*parameters)
# ---------------------------------------------------------------------------
@@ -146,8 +140,6 @@
def _destroy (self, item):
- assert gEnter (9)
-
if hasattr (item, '_destroy'):
item._destroy ()
@@ -161,17 +153,13 @@
if itemId in self._objectPerClient [client]:
del self._objectPerClient [client][itemId]
- assert gLeave (9)
-
# ---------------------------------------------------------------------------
# Add an object to the store or update it's reference
# ---------------------------------------------------------------------------
def _updateStore (self, item, client):
- gEnter (9)
-
# The itemId must be stored as string, because 64 bit numbers cannot be
# transported with xmlrpc
itemId = str (id (item))
@@ -179,8 +167,6 @@
self._objectPerClient.setdefault (client, {}) [itemId] = item
self._clientPerObject [itemId] = client
- assert gLeave (9, result)
-
return result
@@ -204,14 +190,10 @@
def _clearClientObjects (self, client):
- assert gEnter (9)
-
for item in self._objectPerClient.get (client, {}).values ():
self._destroy (item)
- assert gLeave (9)
-
# ---------------------------------------------------------------------------
# Nice string representation
# ---------------------------------------------------------------------------
@@ -256,7 +238,7 @@
Log all requests at debug level 9.
"""
- assert gDebug (9, '"%s" %s %s' % (self.requestline, code, size))
+ assert log.debug ('"%s" %s %s' % (self.requestline, code, size))
# ---------------------------------------------------------------------------
@@ -353,18 +335,14 @@
to the socket.
"""
- assert gEnter (9)
-
allowed = self.serverAdapter and self.serverAdapter.allowed_hosts
for host in allowed:
if client_address [0][:len (host)] == host:
- assert gLeave (9, True)
return True
request.send ('HTTP/1.1 403 Forbidden\r\n\r\n')
self.close_request (request)
- assert gLeave (9, False)
return False
Modified: trunk/gnue-common/src/utils/datatypes.py
===================================================================
--- trunk/gnue-common/src/utils/datatypes.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/utils/datatypes.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -139,7 +139,6 @@
# FIXME: remove with next release of gnue-common when generated
# forms in gnue-appserver have been fixed to use the correct
# datatype.
- gDebug(1, "WARNING: converting time to datetime")
result = datetime.datetime(1900, 1, 1, value.hour, value.minute,
value.second, value.microsecond)
Modified: trunk/gnue-common/src/utils/http.py
===================================================================
--- trunk/gnue-common/src/utils/http.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/utils/http.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -198,7 +198,6 @@
if message is not None:
data += message
- assert gDebug (2, "batch: %s" % self._buffer)
self.wfile.write (data)
self.wfile.flush ()
Modified: trunk/gnue-common/src/utils/uuid.py
===================================================================
--- trunk/gnue-common/src/utils/uuid.py 2009-10-06 13:48:22 UTC (rev 9937)
+++ trunk/gnue-common/src/utils/uuid.py 2009-10-06 14:40:52 UTC (rev 9938)
@@ -41,7 +41,7 @@
import socket
import struct
-from gnue.common.apps import errors
+from gnue.common.base import errors
if sys.platform == 'win32':
from win32com.client import GetObject
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.