modeling-cvs — Receives the syncmail-generated messages (CVS checkins messages)

[Modeling-cvs] ProjectModeling CHANGES,1.48,1.49

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15698

Modified Files:
	CHANGES 
Log Message:
Added support for mx.DateTime.Time

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** CHANGES	22 Mar 2004 20:39:02 -0000	1.48
--- CHANGES	22 May 2004 09:54:41 -0000	1.49
***************
*** 8,11 ****
--- 8,14 ----
    --------------------------------------------------------
  
+   * Added missing support for mx.DateTime.Time, as requested by Ernesto
+     Revilla --patch posted on the ml the 29th Feb 2004.
+ 
    * Fixed bug #918095: tests/run.py fails if neither psycopg, pgdb or pygresql
      is installed

[Modeling-cvs] ProjectModeling/Modeling/tests test_SchemaGeneration.py,1.6,1.7

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18979/Modeling/tests

Modified Files:
	test_SchemaGeneration.py 
Log Message:
Fixed bug #918095: tests/run.py fails if neither psycopg, pgdb or pygresql is installed

Index: test_SchemaGeneration.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_SchemaGeneration.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** test_SchemaGeneration.py	14 Feb 2004 18:17:21 -0000	1.6
--- test_SchemaGeneration.py	22 Mar 2004 20:39:03 -0000	1.7
***************
*** 63,66 ****
--- 63,73 ----
    modelSet.addModelFromXML({'file': xmlmodelPath})
    model=modelSet.modelNamed('simpleModel1')
+   try:
+     import psycopg
+   except ImportError:
+     # fake psycopg, we do not really need it except for successfully
+     # importing the PostgresqlAdaptor
+     import sys
+     sys.modules['psycopg']=1
    pgAdaptor=Adaptor.adaptorWithModel(model)
  

[Modeling-cvs] ProjectModeling CHANGES,1.47,1.48

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18979

Modified Files:
	CHANGES 
Log Message:
Fixed bug #918095: tests/run.py fails if neither psycopg, pgdb or pygresql is installed

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** CHANGES	22 Mar 2004 20:30:28 -0000	1.47
--- CHANGES	22 Mar 2004 20:39:02 -0000	1.48
***************
*** 8,11 ****
--- 8,14 ----
    --------------------------------------------------------
  
+   * Fixed bug #918095: tests/run.py fails if neither psycopg, pgdb or pygresql
+     is installed
+ 
    * Fixed bug #918103: infinite loop when spark is not installed
  

[Modeling-cvs] ProjectModeling/Modeling QualifierParser.py,1.13,1.14

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17281/Modeling

Modified Files:
	QualifierParser.py 
Log Message:
Fixed bug #918103: infinite loop when spark is not installed

Index: QualifierParser.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/QualifierParser.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** QualifierParser.py	14 Feb 2004 18:27:04 -0000	1.13
--- QualifierParser.py	22 Mar 2004 20:30:28 -0000	1.14
***************
*** 72,76 ****
  """
  
! from Qualifier import *
  import string
  
--- 72,83 ----
  """
  
! try:
!   import spark
! except ImportError:
!   import sys
!   try: del sys.modules['Modeling.QualifierParser']
!   except: pass
!   raise
! from Qualifier import KeyValueQualifier, KeyComparisonQualifier, AndQualifier, OrQualifier, NotQualifier, operatorForString, allQualifierOperators
  import string
  
***************
*** 123,127 ****
  #  ASTTraversal is a deprecated interface to GenericASTTraversal.
  #
- import spark
  ASTTraversal = spark.GenericASTTraversal
  
--- 130,133 ----

[Modeling-cvs] ProjectModeling CHANGES,1.46,1.47

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17281

Modified Files:
	CHANGES 
Log Message:
Fixed bug #918103: infinite loop when spark is not installed

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** CHANGES	22 Feb 2004 18:50:49 -0000	1.46
--- CHANGES	22 Mar 2004 20:30:28 -0000	1.47
***************
*** 8,11 ****
--- 8,13 ----
    --------------------------------------------------------
  
+   * Fixed bug #918103: infinite loop when spark is not installed
+ 
  0.9-pre-17.1 (2004/02/22)
  -------------------------

[Modeling-cvs] ProjectModeling/Modeling/DatabaseAdaptors setup.py,1.1,NONE

[Sebastien B. <sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/DatabaseAdaptors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23133

Removed Files:
	setup.py 
Log Message:
Removed brave old 'n useless setup

--- setup.py DELETED ---

[Modeling-cvs] ProjectModeling/Modeling/tests utils.py,1.10,1.11

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25806/Modeling/tests

Modified Files:
	utils.py 
Log Message:
Removed latin-1 chars that make epydoc badly fail

Index: utils.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/utils.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** utils.py	16 Feb 2004 20:01:08 -0000	1.10
--- utils.py	7 Mar 2004 17:36:39 -0000	1.11
***************
*** 26,30 ****
  Helper functions for the test suite.
  
!   (c) Sébastien Bigaret 2002
  
  $Id$
--- 26,30 ----
  Helper functions for the test suite.
  
!   (c) Sebastien Bigaret 2002
  
  $Id$

[Modeling-cvs] ProjectModeling/Modeling Entity.py,1.22,1.23 FaultHandler.py,1.15,1.16

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25806/Modeling

Modified Files:
	Entity.py FaultHandler.py 
Log Message:
Removed latin-1 chars that make epydoc badly fail

Index: Entity.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Entity.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Entity.py	22 Feb 2004 17:31:37 -0000	1.22
--- Entity.py	7 Mar 2004 17:36:39 -0000	1.23
***************
*** 114,119 ****
  from Modeling.utils import base_persistent_object
  class Entity(base_persistent_object, XMLCapability, KeyValueCoding):
!   """
!   Describes an entity
  
    An entity defines a class and its corresponding persistence schema.
--- 114,118 ----
  from Modeling.utils import base_persistent_object
  class Entity(base_persistent_object, XMLCapability, KeyValueCoding):
!   """Describes an entity
  
    An entity defines a class and its corresponding persistence schema.
***************
*** 561,565 ****
          
    def parentEntities(self):
!     """Returns the parent entities (à la super-class, cf. inheritance)
  
      The returned set is ordered: it begins with the direct parent, and ends
--- 560,564 ----
          
    def parentEntities(self):
!     """Returns the parent entities (a la super-class, cf. inheritance)
  
      The returned set is ordered: it begins with the direct parent, and ends
***************
*** 576,580 ****
  
    def parentEntity(self):
!     """Returns the parent entity (à la super-class, cf. inheritance)
      
      See also: %(inheritance_methods)s
--- 575,579 ----
  
    def parentEntity(self):
!     """Returns the parent entity (a la super-class, cf. inheritance)
      
      See also: %(inheritance_methods)s
***************
*** 585,589 ****
    def parentEntityName(self):
      """
!     Returns the parent entity's name (à la super-class, cf. inheritance)
  
      See also: %(inheritance_methods)s
--- 584,588 ----
    def parentEntityName(self):
      """
!     Returns the parent entity's name (a la super-class, cf. inheritance)
  
      See also: %(inheritance_methods)s

Index: FaultHandler.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/FaultHandler.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** FaultHandler.py	14 Feb 2004 18:27:03 -0000	1.15
--- FaultHandler.py	7 Mar 2004 17:36:39 -0000	1.16
***************
*** 364,369 ****
      Implementation notes::
  
!       __TBD cf. besoin de violer la règle du fault qui ne contient pas son
!       __TBD objet, pour le cas des requêtes sur __len__, etc. (sequence-like
        __TBD messages)
  
--- 364,369 ----
      Implementation notes::
  
!       __TBD cf. besoin de violer la regle du fault qui ne contient pas son
!       __TBD objet, pour le cas des requetes sur __len__, etc. (sequence-like
        __TBD messages)
  

[Modeling-cvs] ProjectModeling/Modeling/scripts mdl_generate_DB_schema.py,1.9,1.10

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29228/Modeling/scripts

Modified Files:
	mdl_generate_DB_schema.py 
Log Message:
Fixed bug #902209: mdl_generate_DB_schema.py silently exiting when no command supplied

Index: mdl_generate_DB_schema.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/scripts/mdl_generate_DB_schema.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mdl_generate_DB_schema.py	14 Feb 2004 17:59:32 -0000	1.9
--- mdl_generate_DB_schema.py	22 Feb 2004 18:50:48 -0000	1.10
***************
*** 117,121 ****
  def usage(prgName):
    _usage="""
!   %s [options] model.(xml|py)
    
  Generates and/or executes the SQL code from a model, either an xml file or a
--- 117,121 ----
  def usage(prgName):
    _usage="""
!   %s [options] command(s) model.(xml|py)
    
  Generates and/or executes the SQL code from a model, either an xml file or a
***************
*** 131,138 ****
    -i --ignore-errors  ignore errors (default is halt on error)
    
! DB-schema generation
! --------------------
  
! Most commonly used options:
  
    -A --all-but-database   Drops and recreate everything except the database
--- 131,138 ----
    -i --ignore-errors  ignore errors (default is halt on error)
    
! Commands for DB-schema generation
! ---------------------------------
  
! Most commonly used commands:
  
    -A --all-but-database   Drops and recreate everything except the database
***************
*** 147,151 ****
    Last two options require '--admin-dsn' to be set as well (see below)
  
! Additionally, the following options are available:
  
    -D  drop database   (requires --admin-dsn)
--- 147,151 ----
    Last two options require '--admin-dsn' to be set as well (see below)
  
! Additionally, the following commands are available:
  
    -D  drop database   (requires --admin-dsn)
***************
*** 161,166 ****
    -F  create foreign key constraints
  
! Note: each of the 3 options -A -C and -R (and their corresponding long
!       options) discard any other options that appear before.
        Example: '-D -C' is equivalent to '-C', and '-C -D' is equivalent to '-R'
  
--- 161,166 ----
    -F  create foreign key constraints
  
! Note: each of the 3 commands -A -C and -R (and their corresponding long
!       options) discard any other commands that appear before.
        Example: '-D -C' is equivalent to '-C', and '-C -D' is equivalent to '-R'
  
***************
*** 326,329 ****
--- 326,334 ----
    if len(args)!=1: usage(me) ; return 1
  
+   import operator
+   if not reduce(operator.add, generation_options.values()):
+     sys.stderr.write('Error: no command given, see --help for details\n')
+     return 1
+ 
    model_file=args[0]
    # load the model

[Modeling-cvs] ProjectModeling CHANGES,1.45,1.46

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29228

Modified Files:
	CHANGES 
Log Message:
Fixed bug #902209: mdl_generate_DB_schema.py silently exiting when no command supplied

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** CHANGES	22 Feb 2004 18:17:12 -0000	1.45
--- CHANGES	22 Feb 2004 18:50:49 -0000	1.46
***************
*** 14,18 ****
      NB: useless module Modeling.Persistent removed.
  
!   * Fixed bug #902209: mdl_generate_db_schema.py silently exiting when no
      commands are provided on the cmdline; this could be variously
      misinterpreted. The script now correctly reports this as an error.
--- 14,18 ----
      NB: useless module Modeling.Persistent removed.
  
!   * Fixed bug #902209: mdl_generate_DB_schema.py silently exiting when no
      commands are provided on the cmdline; this could be variously
      misinterpreted. The script now correctly reports this as an error.

[Modeling-cvs] ProjectModeling/Modeling Persistent.py,1.4,NONE

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22709/Modeling

Removed Files:
	Persistent.py 
Log Message:
useless module removed

--- Persistent.py DELETED ---

[Modeling-cvs] ProjectModeling CHANGES,1.44,1.45

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22709

Modified Files:
	CHANGES 
Log Message:
useless module removed

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** CHANGES	22 Feb 2004 17:36:55 -0000	1.44
--- CHANGES	22 Feb 2004 18:17:12 -0000	1.45
***************
*** 12,15 ****
--- 12,21 ----
  
    * Fixed bug #902106: impossible to load a model if ZODB is installed.
+     NB: useless module Modeling.Persistent removed.
+ 
+   * Fixed bug #902209: mdl_generate_db_schema.py silently exiting when no
+     commands are provided on the cmdline; this could be variously
+     misinterpreted. The script now correctly reports this as an error.
+ 
  
  0.9-pre-17 (2004/02/17)

[Modeling-cvs] ProjectModeling/Modeling/doc/HomePage main.tex,1.32,1.33

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15764/Modeling/doc/HomePage

Modified Files:
	main.tex 
Log Message:
Release 0.9pre17.1 / 22 Feb 2004

Index: main.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/main.tex,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** main.tex	22 Feb 2004 17:36:56 -0000	1.32
--- main.tex	22 Feb 2004 17:43:03 -0000	1.33
***************
*** 13,17 ****
  \author{S\'ebastien Bigaret}
  \email{sbi...@us...}
! \date{Feb 17, 2004}
  %\date{\today}
  
--- 13,17 ----
  \author{S\'ebastien Bigaret}
  \email{sbi...@us...}
! \date{Feb 22, 2004}
  %\date{\today}
  

[Modeling-cvs] ProjectModeling/Modeling/doc UserGuide.tex,1.36,1.37

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15764/Modeling/doc

Modified Files:
	UserGuide.tex 
Log Message:
Release 0.9pre17.1 / 22 Feb 2004

Index: UserGuide.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/UserGuide.tex,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** UserGuide.tex	22 Feb 2004 17:36:56 -0000	1.36
--- UserGuide.tex	22 Feb 2004 17:43:03 -0000	1.37
***************
*** 22,26 ****
  % the rest is at your discretion.
  \authoraddress{Email: \email{sbi...@us...}}
! \date{Feb 17, 2004}
  %\date{\today}
  \release{0.9-pre-17.1}
--- 22,26 ----
  % the rest is at your discretion.
  \authoraddress{Email: \email{sbi...@us...}}
! \date{Feb 22, 2004}
  %\date{\today}
  \release{0.9-pre-17.1}

[Modeling-cvs] ProjectModeling vertoo.data,1.12,1.13

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15764

Modified Files:
	vertoo.data 
Log Message:
Release 0.9pre17.1 / 22 Feb 2004

Index: vertoo.data
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/vertoo.data,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** vertoo.data	22 Feb 2004 17:36:55 -0000	1.12
--- vertoo.data	22 Feb 2004 17:43:03 -0000	1.13
***************
*** 1,2 ****
! mdl-code = major:0; minor:9; pre:17.1; release:x; date:Feb 17, 2004;
! mdl_doc = major:0; minor:9; pre:17.1; release:x; date:Feb 17, 2004;
\ No newline at end of file
--- 1,2 ----
! mdl-code = major:0; minor:9; pre:17.1; release:x; date:Feb 22, 2004;
! mdl_doc = major:0; minor:9; pre:17.1; release:x; date:Feb 22, 2004;
\ No newline at end of file

[Modeling-cvs] ProjectModeling/Modeling/doc/HomePage main.tex,1.31,1.32 downloads.tex,1.19,1.20

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14498/Modeling/doc/HomePage

Modified Files:
	main.tex downloads.tex 
Log Message:
Release 0.9pre17.1

Index: main.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/main.tex,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** main.tex	17 Feb 2004 19:12:29 -0000	1.31
--- main.tex	22 Feb 2004 17:36:56 -0000	1.32
***************
*** 7,11 ****
  % Increment the release number whenever significant changes are made.
  % The author and/or editor can define 'significant' however they like.
! %\release{0.9-pre-17}
  
  % At minimum, give your name and an email address.  You can include a
--- 7,11 ----
  % Increment the release number whenever significant changes are made.
  % The author and/or editor can define 'significant' however they like.
! %\release{0.9-pre-17.1}
  
  % At minimum, give your name and an email address.  You can include a

Index: downloads.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/downloads.tex,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** downloads.tex	17 Feb 2004 19:12:29 -0000	1.19
--- downloads.tex	22 Feb 2004 17:36:56 -0000	1.20
***************
*** 10,14 ****
  
  \begin{enumerate}
! \item[\bf Current version: 0.9-pre-17]
  
  Download it here:\begin{rawhtml}<a
--- 10,14 ----
  
  \begin{enumerate}
! \item[\bf Current version: 0.9-pre-17.1]
  
  Download it here:\begin{rawhtml}<a

[Modeling-cvs] ProjectModeling setup.py,1.37,1.38 vertoo.data,1.11,1.12 CHANGES,1.43,1.44

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14498

Modified Files:
	setup.py vertoo.data CHANGES 
Log Message:
Release 0.9pre17.1

Index: setup.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/setup.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** setup.py	17 Feb 2004 19:12:27 -0000	1.37
--- setup.py	22 Feb 2004 17:36:55 -0000	1.38
***************
*** 82,86 ****
  
  setup(name="ModelingCore",
!       version="0.9-pre-17",
        license ="GNU General Public License",
        description=short_description,
--- 82,86 ----
  
  setup(name="ModelingCore",
!       version="0.9-pre-17.1",
        license ="GNU General Public License",
        description=short_description,

Index: vertoo.data
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/vertoo.data,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** vertoo.data	17 Feb 2004 19:12:27 -0000	1.11
--- vertoo.data	22 Feb 2004 17:36:55 -0000	1.12
***************
*** 1,2 ****
! mdl-code = major:0; minor:9; pre:17; release:x; date:Feb 17, 2004;
! mdl_doc = major:0; minor:9; pre:17; release:x; date:Feb 17, 2004;
\ No newline at end of file
--- 1,2 ----
! mdl-code = major:0; minor:9; pre:17.1; release:x; date:Feb 17, 2004;
! mdl_doc = major:0; minor:9; pre:17.1; release:x; date:Feb 17, 2004;
\ No newline at end of file

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** CHANGES	22 Feb 2004 17:31:36 -0000	1.43
--- CHANGES	22 Feb 2004 17:36:55 -0000	1.44
***************
*** 3,13 ****
  Module Modeling
  ---------------
! Current release is: 0.9-pre-17   /   See also: TODO, INSTALL and doc/
  
    * ** Distributed under the GNU General Public License **
    --------------------------------------------------------
  
! 0.9-pre-17.1 (2004/02/17)
! -----------------------
  
    * Fixed bug #902106: impossible to load a model if ZODB is installed.
--- 3,13 ----
  Module Modeling
  ---------------
! Current release is: 0.9-pre-17.1   /   See also: TODO, INSTALL and doc/
  
    * ** Distributed under the GNU General Public License **
    --------------------------------------------------------
  
! 0.9-pre-17.1 (2004/02/22)
! -------------------------
  
    * Fixed bug #902106: impossible to load a model if ZODB is installed.

[Modeling-cvs] ProjectModeling/Modeling/doc UserGuide.tex,1.35,1.36 Tutorial.tex,1.13,1.14

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14498/Modeling/doc

Modified Files:
	UserGuide.tex Tutorial.tex 
Log Message:
Release 0.9pre17.1

Index: UserGuide.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/UserGuide.tex,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** UserGuide.tex	17 Feb 2004 19:12:28 -0000	1.35
--- UserGuide.tex	22 Feb 2004 17:36:56 -0000	1.36
***************
*** 24,28 ****
  \date{Feb 17, 2004}
  %\date{\today}
! \release{0.9-pre-17}
  %\setreleaseinfo{pre-8}
  \setshortversion{0.9}
--- 24,28 ----
  \date{Feb 17, 2004}
  %\date{\today}
! \release{0.9-pre-17.1}
  %\setreleaseinfo{pre-8}
  \setshortversion{0.9}

Index: Tutorial.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/Tutorial.tex,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Tutorial.tex	17 Feb 2004 19:12:29 -0000	1.13
--- Tutorial.tex	22 Feb 2004 17:36:56 -0000	1.14
***************
*** 14,18 ****
  \date{February 10, 2003}
  %\date{\today}
! \release{0.9-pre-17}
  %\setreleaseinfo{5}
  \setshortversion{0.9}
--- 14,18 ----
  \date{February 10, 2003}
  %\date{\today}
! \release{0.9-pre-17.1}
  %\setreleaseinfo{5}
  \setshortversion{0.9}

[Modeling-cvs] ProjectModeling/Modeling __init__.py,1.7,1.8

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14498/Modeling

Modified Files:
	__init__.py 
Log Message:
Release 0.9pre17.1

Index: __init__.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/__init__.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** __init__.py	17 Feb 2004 19:12:28 -0000	1.7
--- __init__.py	22 Feb 2004 17:36:56 -0000	1.8
***************
*** 37,41 ****
  """
  
! __version__="0.9-pre-17"
  
  import DatabaseContext # make it register itself for notifications
--- 37,41 ----
  """
  
! __version__="0.9-pre-17.1"
  
  import DatabaseContext # make it register itself for notifications

[Modeling-cvs] ProjectModeling/Modeling/doc/HomePage features.tex,1.2,1.3

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13799/Modeling/doc/HomePage

Modified Files:
	features.tex 
Log Message:
misc update

Index: features.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/features.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** features.tex	16 Nov 2003 16:49:23 -0000	1.2
--- features.tex	22 Feb 2004 17:33:29 -0000	1.3
***************
*** 42,47 ****
  \begin{itemize}
  
! \item A comprehensive model description language (XML) to specify how the object 
!       model is to map to a relational model,
  
  \item Functional tools to help you designing your model (in the form of
--- 42,48 ----
  \begin{itemize}
  
! \item A comprehensive model description language to specify how the object
!       model is to map to a relational model, either pure python (PyModels) or
!       XML.
  
  \item Functional tools to help you designing your model (in the form of

[Modeling-cvs] ProjectModeling/Modeling Attribute.py,1.20,1.21 Entity.py,1.21,1.22 Join.py,1.6,1.7 Model.py,1.15,1.16 ModelSet.py,1.11,1.12 Relationship.py,1.18,1.19 utils.py,1.19,1.20

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13414/Modeling

Modified Files:
	Attribute.py Entity.py Join.py Model.py ModelSet.py 
	Relationship.py utils.py 
Log Message:
Fixed bug #902106: impossible to load a model if ZODB is installed.

Index: Attribute.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Attribute.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Attribute.py	14 Feb 2004 18:27:03 -0000	1.20
--- Attribute.py	22 Feb 2004 17:31:37 -0000	1.21
***************
*** 35,43 ****
  
  # Modeling
! from utils import isaValidName, toBoolean
! from XMLutils import *
! from Model import ModelError
! from KeyValueCoding import KeyValueCoding
! import Validation
  from Modeling.utils import capitalizeFirstLetter
  
--- 35,43 ----
  
  # Modeling
! from Modeling.utils import isaValidName, toBoolean
! from Modeling.XMLutils import *
! from Modeling.Model import ModelError
! from Modeling.KeyValueCoding import KeyValueCoding
! from Modeling import Validation
  from Modeling.utils import capitalizeFirstLetter
  
***************
*** 96,106 ****
    return tuple([t.__name__ for t in avail_types])
  
! try:
!   import ZODB
!   from Persistence import Persistent
! except:
!   from Persistent import Persistent
  
! class Attribute(Persistent, XMLCapability, KeyValueCoding):
    "Describes an attribute"
    # + public/private _TBD
--- 96,102 ----
    return tuple([t.__name__ for t in avail_types])
  
! from Modeling.utils import base_persistent_object
  
! class Attribute(base_persistent_object, XMLCapability, KeyValueCoding):
    "Describes an attribute"
    # + public/private _TBD

Index: Entity.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Entity.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Entity.py	16 Feb 2004 20:01:06 -0000	1.21
--- Entity.py	22 Feb 2004 17:31:37 -0000	1.22
***************
*** 31,45 ****
  
  # Modeling
! from utils import isListOrTuple, isaValidName, toBoolean, finalize_docstrings
! from XMLutils import *
! from EntityClassDescription import EntityClassDescription
! from KeyValueCoding import KeyValueCoding
! from Model import ModelError
! from Attribute import Attribute
! from Exceptions import ModelValidationError
! import Validation 
! import Qualifier
  
! from GlobalID import KeyGlobalID
  
  # python
--- 31,45 ----
  
  # Modeling
! from Modeling.utils import isListOrTuple, isaValidName, toBoolean, finalize_docstrings
! from Modeling.XMLutils import *
! from Modeling.EntityClassDescription import EntityClassDescription
! from Modeling.KeyValueCoding import KeyValueCoding
! from Modeling.Model import ModelError
! from Modeling.Attribute import Attribute
! from Modeling.Exceptions import ModelValidationError
! from Modeling import Validation 
! from Modeling import Qualifier
  
! from Modeling.GlobalID import KeyGlobalID
  
  # python
***************
*** 47,51 ****
  import re, string, sys, types
  
! from logging import debug
  
  ENTITY_DOC = {
--- 47,51 ----
  import re, string, sys, types
  
! from Modeling.logging import debug
  
  ENTITY_DOC = {
***************
*** 112,123 ****
      
  
! try:
!   import ZODB
!   from Persistence import Persistent
! except:
!   from Persistent import Persistent
! 
! from Modeling.utils import base_object
! class Entity(base_object, XMLCapability, Persistent, KeyValueCoding):
    """
    Describes an entity
--- 112,117 ----
      
  
! from Modeling.utils import base_persistent_object
! class Entity(base_persistent_object, XMLCapability, KeyValueCoding):
    """
    Describes an entity

Index: Join.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Join.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Join.py	14 Feb 2004 18:27:03 -0000	1.6
--- Join.py	22 Feb 2004 17:31:38 -0000	1.7
***************
*** 33,41 ****
  __version__='$Revision$'[11:-2]
  
! from utils import isaValidName
  
  import types
  
! from XMLutils import *
  
  class Join(XMLCapability):
--- 33,41 ----
  __version__='$Revision$'[11:-2]
  
! from Modeling.utils import isaValidName
  
  import types
  
! from Modeling.XMLutils import *
  
  class Join(XMLCapability):

Index: Model.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Model.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Model.py	17 Feb 2004 19:03:16 -0000	1.15
--- Model.py	22 Feb 2004 17:31:38 -0000	1.16
***************
*** 39,53 ****
  
  #from Entity import Entity
! from utils import isaValidName
! from XMLutils import *
! from KeyValueCoding import KeyValueCoding
  import types
  
- try:
-   import ZODB
-   from Persistence import Persistent
- except:
-   from Persistent import Persistent
- 
  def updateModelWithCFG(model, cfg_path=None):
    """
--- 39,47 ----
  
  #from Entity import Entity
! from Modeling.utils import isaValidName, base_persistent_object
! from Modeling.XMLutils import *
! from Modeling.KeyValueCoding import KeyValueCoding
  import types
  
  def updateModelWithCFG(model, cfg_path=None):
    """
***************
*** 163,168 ****
            from NotificationFramework.mems_lib import isinstance
            if callable(model) and not isinstance(model, Model):
!             # Model.Model derives from ZODB.Persistent, hence it is callable
!             # but it shouldn't be called!
              model=model()
            import PyModel
--- 157,162 ----
            from NotificationFramework.mems_lib import isinstance
            if callable(model) and not isinstance(model, Model):
!             # Model.Model may derive from ZODB.Persistent if ZODB is installed:
!             # in this case it is callable but it shouldn't be called!
              model=model()
            import PyModel
***************
*** 249,253 ****
    return None
  
! class Model(Persistent, XMLCapability, KeyValueCoding):
    "Describes a model"
    _is_a_model = 1
--- 243,247 ----
    return None
  
! class Model(base_persistent_object, XMLCapability, KeyValueCoding):
    "Describes a model"
    _is_a_model = 1

Index: ModelSet.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/ModelSet.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ModelSet.py	14 Feb 2004 18:27:03 -0000	1.11
--- ModelSet.py	22 Feb 2004 17:31:38 -0000	1.12
***************
*** 48,68 ****
  __version__='$Revision$'[11:-2]
  
! from utils import isaValidName
! from XMLutils import *
! from Model import ModelError, Model
! from ClassDescription import ClassDescriptionNeededForEntityNameNotification
  from NotificationFramework import NotificationCenter
  NC=NotificationCenter
! import ClassDescription
  import types
  from xml.dom.minidom import parseString
  
! from logging import error, warn
! 
! try:
!   import ZODB
!   from Persistence import Persistent
! except:
!   from Persistent import Persistent
  
  from threading import RLock
--- 48,62 ----
  __version__='$Revision$'[11:-2]
  
! from Modeling.utils import isaValidName, base_persistent_object
! from Modeling.XMLutils import *
! from Modeling.Model import ModelError, Model
! from Modeling.ClassDescription import ClassDescriptionNeededForEntityNameNotification
  from NotificationFramework import NotificationCenter
  NC=NotificationCenter
! from Modeling import ClassDescription
  import types
  from xml.dom.minidom import parseString
  
! from Modeling.logging import error, warn
  
  from threading import RLock
***************
*** 111,115 ****
    return Model.updateModelWithCFG(model, cfg_path)
  
! class ModelSet(Persistent):
    """Holds a set of Modeling.Models that can co-exist at runtime
  
--- 105,109 ----
    return Model.updateModelWithCFG(model, cfg_path)
  
! class ModelSet(base_persistent_object):
    """Holds a set of Modeling.Models that can co-exist at runtime
  

Index: Relationship.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/Relationship.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Relationship.py	14 Feb 2004 18:27:04 -0000	1.18
--- Relationship.py	22 Feb 2004 17:31:38 -0000	1.19
***************
*** 31,43 ****
  
  # Modeling
! from Join import Join
! from utils import isaValidName, toBoolean
! from KeyValueCoding import KeyValueCoding
! from XMLutils import *
! import Validation
  
  # Interfaces
! from interfaces.Relationship import RelationshipInterface
! from interfaces.XMLCapability import XMLCapabilityInterface
  
  # python
--- 31,43 ----
  
  # Modeling
! from Modeling.Join import Join
! from Modeling.utils import isaValidName, toBoolean
! from Modeling.KeyValueCoding import KeyValueCoding
! from Modeling.XMLutils import *
! from Modeling import Validation
  
  # Interfaces
! from Modeling.interfaces.Relationship import RelationshipInterface
! from Modeling.interfaces.XMLCapability import XMLCapabilityInterface
  
  # python
***************
*** 51,57 ****
  
  # Relationships props
! from ClassDescription import DELETE_NULLIFY, DELETE_DENY, DELETE_CASCADE, DELETE_NOACTION, old_delete_rules
  
! from utils import isListOrTuple
  
  class RelationshipError(Exception):
--- 51,57 ----
  
  # Relationships props
! from Modeling.ClassDescription import DELETE_NULLIFY, DELETE_DENY, DELETE_CASCADE, DELETE_NOACTION, old_delete_rules
  
! from Modeling.utils import isListOrTuple, base_persistent_object
  
  class RelationshipError(Exception):
***************
*** 59,70 ****
    pass
  
- try:
-   import ZODB
-   from Persistence import Persistent
- except:
-   from Persistent import Persistent
- 
  
! class Relationship(Persistent, XMLCapability, KeyValueCoding):
    "See interfaces.Relationship for detail"
    #
--- 59,64 ----
    pass
  
  
! class Relationship(base_persistent_object, XMLCapability, KeyValueCoding):
    "See interfaces.Relationship for detail"
    #

Index: utils.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/utils.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** utils.py	16 Feb 2004 20:01:06 -0000	1.19
--- utils.py	22 Feb 2004 17:31:38 -0000	1.20
***************
*** 28,31 ****
--- 28,42 ----
  tools using this framework.
  
+ The module also defines two classes:
+ 
+   - `base_object` is equivalent to ``object`` (``types.ObjectType``) when
+     it is available (python2.2 or higher), or is an empty class in python2.1
+ 
+   - `base_persistent_object` equals to ``ZODB.Persistent`` if ZODB is
+     installed, or else equals to `base_object`. This is for use by `Model`,
+     `Entity`, `Attribute` and `Relationship` --the ZModeler in particular
+     requires that they inherit from ``ZODB.Persistent`` so that they can be
+     stored in the zodb.
+ 
  $Id$"""
  
***************
*** 47,50 ****
--- 58,68 ----
      newclass = 0
  
+ try:
+   import ZODB
+   from Persistence import Persistent
+   base_persistent_object=Persistent
+ except:
+   base_persistent_object=base_object
+ 
  _validFirstLetter = "_"+string.letters
  

[Modeling-cvs] ProjectModeling CHANGES,1.42,1.43

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13414

Modified Files:
	CHANGES 
Log Message:
Fixed bug #902106: impossible to load a model if ZODB is installed.

Index: CHANGES
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/CHANGES,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** CHANGES	17 Feb 2004 19:12:27 -0000	1.42
--- CHANGES	22 Feb 2004 17:31:36 -0000	1.43
***************
*** 8,11 ****
--- 8,16 ----
    --------------------------------------------------------
  
+ 0.9-pre-17.1 (2004/02/17)
+ -----------------------
+ 
+   * Fixed bug #902106: impossible to load a model if ZODB is installed.
+ 
  0.9-pre-17 (2004/02/17)
  -----------------------

[Modeling-cvs] ProjectModeling/Modeling/tests test_EditingContext_Global.py,1.49,1.50

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6034

Modified Files:
	test_EditingContext_Global.py 
Log Message:
Fixed a small pb. w/ Oracle

Index: test_EditingContext_Global.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_EditingContext_Global.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** test_EditingContext_Global.py	16 Feb 2004 20:01:08 -0000	1.49
--- test_EditingContext_Global.py	17 Feb 2004 20:04:10 -0000	1.50
***************
*** 1519,1523 ****
    if database_cfg=='Oracle.cfg':
      author_books_model.entityNamed('Writer').attributeNamed('birthday').setExternalType('DATE')
! 
    # SQLite specifics: test_12 requires that the framework closes the db
    # connection, so that the new context/channel can connect to the db (sqlite
--- 1519,1525 ----
    if database_cfg=='Oracle.cfg':
      author_books_model.entityNamed('Writer').attributeNamed('birthday').setExternalType('DATE')
!     from AuthorBooks import Writer
!     reload(Writer)
!  
    # SQLite specifics: test_12 requires that the framework closes the db
    # connection, so that the new context/channel can connect to the db (sqlite

[Modeling-cvs] ProjectModeling/Modeling/doc/HomePage main.tex,1.30,1.31 downloads.tex,1.18,1.19

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26994/Modeling/doc/HomePage

Modified Files:
	main.tex downloads.tex 
Log Message:
Release 0.9pre17

Index: main.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/main.tex,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** main.tex	14 Feb 2004 16:32:59 -0000	1.30
--- main.tex	17 Feb 2004 19:12:29 -0000	1.31
***************
*** 7,11 ****
  % Increment the release number whenever significant changes are made.
  % The author and/or editor can define 'significant' however they like.
! %\release{0.9-pre-16}
  
  % At minimum, give your name and an email address.  You can include a
--- 7,11 ----
  % Increment the release number whenever significant changes are made.
  % The author and/or editor can define 'significant' however they like.
! %\release{0.9-pre-17}
  
  % At minimum, give your name and an email address.  You can include a
***************
*** 13,17 ****
  \author{S\'ebastien Bigaret}
  \email{sbi...@us...}
! \date{Nov 16, 2003}
  %\date{\today}
  
--- 13,17 ----
  \author{S\'ebastien Bigaret}
  \email{sbi...@us...}
! \date{Feb 17, 2004}
  %\date{\today}
  

Index: downloads.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/HomePage/downloads.tex,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** downloads.tex	16 Nov 2003 17:08:01 -0000	1.18
--- downloads.tex	17 Feb 2004 19:12:29 -0000	1.19
***************
*** 10,14 ****
  
  \begin{enumerate}
! \item[\bf Current version: 0.9-pre-16]
  
  Download it here:\begin{rawhtml}<a
--- 10,14 ----
  
  \begin{enumerate}
! \item[\bf Current version: 0.9-pre-17]
  
  Download it here:\begin{rawhtml}<a

[Modeling-cvs] ProjectModeling/Modeling/doc UserGuide.tex,1.34,1.35 Tutorial.tex,1.12,1.13

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/doc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26994/Modeling/doc

Modified Files:
	UserGuide.tex Tutorial.tex 
Log Message:
Release 0.9pre17

Index: UserGuide.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/UserGuide.tex,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** UserGuide.tex	14 Feb 2004 16:32:58 -0000	1.34
--- UserGuide.tex	17 Feb 2004 19:12:28 -0000	1.35
***************
*** 22,28 ****
  % the rest is at your discretion.
  \authoraddress{Email: \email{sbi...@us...}}
! \date{Nov 16, 2003}
  %\date{\today}
! \release{0.9-pre-16}
  %\setreleaseinfo{pre-8}
  \setshortversion{0.9}
--- 22,28 ----
  % the rest is at your discretion.
  \authoraddress{Email: \email{sbi...@us...}}
! \date{Feb 17, 2004}
  %\date{\today}
! \release{0.9-pre-17}
  %\setreleaseinfo{pre-8}
  \setshortversion{0.9}

Index: Tutorial.tex
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/doc/Tutorial.tex,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Tutorial.tex	16 Nov 2003 17:08:00 -0000	1.12
--- Tutorial.tex	17 Feb 2004 19:12:29 -0000	1.13
***************
*** 14,18 ****
  \date{February 10, 2003}
  %\date{\today}
! \release{0.9-pre-16}
  %\setreleaseinfo{5}
  \setshortversion{0.9}
--- 14,18 ----
  \date{February 10, 2003}
  %\date{\today}
! \release{0.9-pre-17}
  %\setreleaseinfo{5}
  \setshortversion{0.9}