[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue appserver/src/__init__.py common/src/__ini...
|
From: |
Jason Cater |
|
Subject: |
gnue appserver/src/__init__.py common/src/__ini... |
|
Date: |
Tue, 15 Apr 2003 18:06:32 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue
Changes by: Jason Cater <address@hidden> 03/04/15 18:06:32
Modified files:
appserver/src : __init__.py
common/src : __init__.py
designer/src : __init__.py
forms/src : __init__.py
navigator/src : __init__.py
reports/src : __init__.py
reports/src/adapters/filters/Standard/Base/psutils:
PrinterDefinition.py
Log message:
set version numbers to reflect development status
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/appserver/src/__init__.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/__init__.py.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/designer/src/__init__.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/forms/src/__init__.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/navigator/src/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/__init__.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
Patches:
Index: gnue/appserver/src/__init__.py
diff -c gnue/appserver/src/__init__.py:1.9 gnue/appserver/src/__init__.py:1.10
*** gnue/appserver/src/__init__.py:1.9 Sun Apr 6 22:12:35 2003
--- gnue/appserver/src/__init__.py Tue Apr 15 18:06:30 2003
***************
*** 31,38 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,0,3)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 31,38 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,0,4)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index: gnue/common/src/__init__.py
diff -c gnue/common/src/__init__.py:1.27 gnue/common/src/__init__.py:1.28
*** gnue/common/src/__init__.py:1.27 Sun Apr 6 22:12:35 2003
--- gnue/common/src/__init__.py Tue Apr 15 18:06:32 2003
***************
*** 31,38 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,0)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 31,38 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,1)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index: gnue/designer/src/__init__.py
diff -c gnue/designer/src/__init__.py:1.20 gnue/designer/src/__init__.py:1.21
*** gnue/designer/src/__init__.py:1.20 Sun Apr 6 22:12:35 2003
--- gnue/designer/src/__init__.py Tue Apr 15 18:06:32 2003
***************
*** 31,38 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,0)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 31,38 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,1)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index: gnue/forms/src/__init__.py
diff -c gnue/forms/src/__init__.py:1.16 gnue/forms/src/__init__.py:1.17
*** gnue/forms/src/__init__.py:1.16 Sun Apr 6 22:12:35 2003
--- gnue/forms/src/__init__.py Tue Apr 15 18:06:32 2003
***************
*** 31,38 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,0)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 31,38 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,5,1)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index: gnue/navigator/src/__init__.py
diff -c gnue/navigator/src/__init__.py:1.12 gnue/navigator/src/__init__.py:1.13
*** gnue/navigator/src/__init__.py:1.12 Tue Apr 15 17:35:18 2003
--- gnue/navigator/src/__init__.py Tue Apr 15 18:06:32 2003
***************
*** 30,37 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,0,4)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 30,37 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,0,5)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index: gnue/reports/src/__init__.py
diff -c gnue/reports/src/__init__.py:1.14 gnue/reports/src/__init__.py:1.15
*** gnue/reports/src/__init__.py:1.14 Sun Apr 6 22:12:35 2003
--- gnue/reports/src/__init__.py Tue Apr 15 18:06:32 2003
***************
*** 30,37 ****
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,1,1)
! _release = 1
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
--- 30,37 ----
# 4. Set _release = 0
# 5. Commit to CVS
! _version = (0,1,2)
! _release = 0
# Version will be of the form "1.1.2" if a release or "1.1.1.99" if in CVS
if _release:
Index:
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py
diff -c
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.8
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.9
***
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py:1.8
Mon Apr 7 18:28:38 2003
---
gnue/reports/src/adapters/filters/Standard/Base/psutils/PrinterDefinition.py
Tue Apr 15 18:06:32 2003
***************
*** 51,58 ****
self.loadFile(location)
! def loadFile(self, location):
# Get a file handle.
# location can be either a string, or a buffer
if hasattr(location,'read'):
--- 51,64 ----
self.loadFile(location)
! def __getattr__(self, attr):
! if self.__dict__.has_key(attr):
! return self.__dict__[attr]
! else:
! return self.__properties__[attr]
!
+ def loadFile(self, location):
# Get a file handle.
# location can be either a string, or a buffer
if hasattr(location,'read'):
***************
*** 107,117 ****
option, option_translation = option.split('/',1)
## print " Option/Trans=[%s] [%s]/[%s]" % (keyword, option,
option_translation)
except ValueError:
! option_translation = option
## print " Option=%s" % (option)
except ValueError:
option = None
# ^Data means Data is a Symbol
if data[:1] == '^':
--- 113,124 ----
option, option_translation = option.split('/',1)
## print " Option/Trans=[%s] [%s]/[%s]" % (keyword, option,
option_translation)
except ValueError:
! option_translation = None
## print " Option=%s" % (option)
except ValueError:
option = None
+ option_translation = None
# ^Data means Data is a Symbol
if data[:1] == '^':
***************
*** 123,131 ****
# Double Quotes means data is Quoted... treat specially
elif data[:1] == '"':
! # If last character is a quote, then this is a single-line string
! if data[-1:] == '"' and len(data) > 1:
! data = data[1:-1]
# otherwise, we need to grab the rest of the data
else:
--- 130,140 ----
# Double Quotes means data is Quoted... treat specially
elif data[:1] == '"':
! # If quote ends on this line, this is a single-line quote
! if data[1:].find('"') >= 0:
! # For now, we ignore any option translation strings
! pos = data[1:].find('"')+2
! data = data[1:pos]
# otherwise, we need to grab the rest of the data
else:
***************
*** 169,177 ****
self.__symbols__[option[1:]] = data
# Keywords we don't need to keep.
! # We include all "query" keywords (*?....)
elif keyword in ('End','SymbolLength','SymbolEnd') \
! or keyword[:1] == '?':
pass
elif keyword[:7] == 'Default':
--- 178,186 ----
self.__symbols__[option[1:]] = data
# Keywords we don't need to keep.
! # We include all "query" and JCL keywords (*?.., *JCL...)
elif keyword in ('End','SymbolLength','SymbolEnd') \
! or keyword[:1] == '?' or keyword[:3] == 'JCL':
pass
elif keyword[:7] == 'Default':
***************
*** 179,191 ****
if not self.__defaults__.has_key(keyword[7:]):
self.__defaults__[keyword[7:]] = data
# Next in line, please!
line = handle.readline()
-
# If we opened a file, close it.
if close:
handle.close()
class _SymbolData:
--- 188,223 ----
if not self.__defaults__.has_key(keyword[7:]):
self.__defaults__[keyword[7:]] = data
+ else:
+ try:
+ cache = self.__properties__[keyword]
+ except KeyError:
+ cache = []
+ self.__properties__[keyword] = cache
+
+ prop = _Property(keyword, option, option_translation, data)
+ cache.append(prop)
+
# Next in line, please!
line = handle.readline()
# If we opened a file, close it.
if close:
handle.close()
+
+
+ class _Property:
+ def __init__(self, keyword, option=None, option_translation=None,
data=None):
+ self.keyword = keyword
+ self.option = option
+ self.option_translation = option_translation
+ self.data = data
+
+ def __repr__(self):
+ if self.option:
+ return "<_Property (%s/%s) at %s>" % (self.keyword, self.option,
id(self))
+ else:
+ return "<_Property (%s) at %s>" % (self.keyword, id(self))
class _SymbolData: