Author: reinhard
Date: 2010-11-14 12:36:34 -0600 (Sun, 14 Nov 2010)
New Revision: 10239
Modified:
trunk/gnue-common/
trunk/gnue-common/src/apps/GBaseApp.py
trunk/gnue-common/src/datasources/GConditions.py
Log:
Run with Python 2.4 so nightlies can be generated on ash, removed some check
for older Python versions.
Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2010-11-14 14:00:53.595999956 +0100
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: common
+ timestamp: 2010-11-14 19:35:32.653000116 +0100
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: common
Name: bzr:file-ids
- setup.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:setup.py
src/base/setup.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Fsetup.py
+ src/apps/GBaseApp.py
1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fapps%2FGBaseApp.py
src/datasources/GConditions.py
1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2FGConditions.py
Name: bzr:revision-id:v4
- 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z
3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo
3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv
3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg
3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28
3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv
3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2
3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3
3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql
3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp
3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a
3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv
3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs
3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1
3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93
3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz
3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4
3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco
3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv
3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a
3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc
3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7
3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu
3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc
+ 3116 reinhard.muel...@bytewise.at-20100426083315-ccfwx2pihuvqn60z
3117 reinhard.muel...@bytewise.at-20100503114756-unpxm52de0towufo
3118 reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv
3119 reinhard.muel...@bytewise.at-20100505081835-9peco6k7a2le0mvg
3120 reinhard.muel...@bytewise.at-20100505084742-wn5vtc4a129z8g28
3121 reinhard.muel...@bytewise.at-20100505092131-m2avvsci5w6aj0rv
3122 reinhard.muel...@bytewise.at-20100519151545-pybk8q2s234vzsf2
3123 reinhard.muel...@bytewise.at-20100525101023-xs7k6pkghh9t6fc3
3124 reinhard.muel...@bytewise.at-20100525114015-rj7eb0xdheqkcuql
3125 reinhard.muel...@bytewise.at-20100525145035-j177jbvu10me4mfp
3126 reinhard.muel...@bytewise.at-20100526111738-ic0wot9z1ulg2y1a
3127 reinhard.muel...@bytewise.at-20100612121357-1nf23tuj1tveh1lv
3128 reinhard.muel...@bytewise.at-20100929190642-6pp6cwlicgt2bhhs
3129 reinhard.muel...@bytewise.at-20100929190817-bje4kkvrjrpanut1
3130 reinhard.muel...@bytewise.at-20101016191602-kceb6hdjytt4im93
3131 reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz
3132 reinhard.muel...@bytewise.at-20101020195535-gb2bt2h80mu5j5h4
3133 reinhard.muel...@bytewise.at-20101020203525-nvdwy7b9r84bngco
3134 reinhard.muel...@bytewise.at-20101028150844-49qu2auedxl5b5kv
3135 reinhard.muel...@bytewise.at-20101028152619-p6ytgkke9zw38o7a
3136 reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc
3137 reinhard.muel...@bytewise.at-20101102085857-sgtswbhhj0baf9d7
3138 reinhard.muel...@bytewise.at-20101103071215-929sbj5boj2wcxuu
3139 reinhard.muel...@bytewise.at-20101114130053-ueyx4ilszsilw6hc
3140 reinhard.muel...@bytewise.at-20101114183532-h66yegryl7hcen0f
Name: bzr:text-parents
- setup.py reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc
src/base/setup.py
reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc
+ src/apps/GBaseApp.py
reinhard.muel...@bytewise.at-20101102085744-sfxbu24ep3nwxixc
src/datasources/GConditions.py
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py 2010-11-14 18:34:58 UTC (rev
10238)
+++ trunk/gnue-common/src/apps/GBaseApp.py 2010-11-14 18:36:34 UTC (rev
10239)
@@ -229,7 +229,7 @@
os.path.join(paths.config, "connections.conf")) ]
# Python version check
- if not hasattr(sys, 'hexversion') or sys.hexversion < 0x02050000:
+ if not hasattr(sys, 'hexversion') or sys.hexversion < 0x02040000:
msg = u_("This application requires Python 2.5 or greater.")
if hasattr(sys, 'version'):
msg = u_("This application requires Python 2.5 or greater. "
Modified: trunk/gnue-common/src/datasources/GConditions.py
===================================================================
--- trunk/gnue-common/src/datasources/GConditions.py 2010-11-14 18:34:58 UTC
(rev 10238)
+++ trunk/gnue-common/src/datasources/GConditions.py 2010-11-14 18:36:34 UTC
(rev 10239)
@@ -27,8 +27,7 @@
import re
import sys
import datetime
-if sys.hexversion >= 0x02040000:
- import decimal
+import decimal
from gnue.common.base import errors
@@ -1724,8 +1723,7 @@
newValue = 0L
# Boolean to Decimal
- elif sys.hexversion >= 0x02040000 \
- and isinstance (chkValue, decimal.Decimal):
+ elif isinstance (chkValue, decimal.Decimal):
if oldValue:
newValue = decimal.Decimal(1)
else:
@@ -1754,8 +1752,7 @@
newValue = long (oldValue)
# Integer to Decimal
- elif sys.hexversion >= 0x02040000 \
- and isinstance (chkValue, decimal.Decimal):
+ elif isinstance (chkValue, decimal.Decimal):
newValue = decimal.Decimal (oldValue)
else:
raise ConversionRuleError, (oldValue, chkValue)
@@ -1776,15 +1773,13 @@
newValue = float (oldValue)
# Long to Decimal
- elif sys.hexversion >= 0x02040000 \
- and isinstance (chkValue, decimal.Decimal):
+ elif isinstance (chkValue, decimal.Decimal):
newValue = decimal.Decimal (oldValue)
else:
raise ConversionRuleError, (oldValue, chkValue)
# Decimal conversion (Python 2.4 or later)
- elif sys.hexversion >= 0x02040000 \
- and (isinstance (v1, decimal.Decimal) \
+ elif (isinstance (v1, decimal.Decimal) \
or isinstance (v2, decimal.Decimal)):
if isinstance (v1, decimal.Decimal):
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
