Author: reinhard
Date: 2010-11-02 04:21:52 -0500 (Tue, 02 Nov 2010)
New Revision: 10230
Modified:
trunk/gnue-common/
trunk/gnue-common/setup-bzr.py
trunk/gnue-common/setup.py
trunk/gnue-common/src/apps/GBaseApp.py
trunk/gnue-common/src/base/log.py
trunk/gnue-common/src/base/setup.py
trunk/gnue-common/src/rpc/drivers/xmlrpc/typeconv.py
Log:
Require Python 2.5.
Property changes on: trunk/gnue-common
___________________________________________________________________
Name: bzr:revision-info
- timestamp: 2010-10-28 17:26:19.497999907 +0200
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: common
+ timestamp: 2010-11-02 09:57:44.948999882 +0100
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
properties:
branch-nick: common
Name: bzr:file-ids
- src/datasources/drivers/Base/ResultSet.py
4...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fdatasources%2Fdrivers%2FBase%2FResultSet.py
+ setup-bzr.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:setup-svn.py
setup.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:setup.py
src/apps/GBaseApp.py
1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fapps%2FGBaseApp.py
src/base/log.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Flog.py
src/base/setup.py
9...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Fbase%2Fsetup.py
src/rpc/drivers/xmlrpc/typeconv.py
7...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:src%2Frpc%2Fdrivers%2Fxmlrpc%2Ftypeconv.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
+ 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
Name: bzr:text-parents
-
+ setup-bzr.py
reinhard.muel...@bytewise.at-20101020175112-o65lqy8lejjrvzaz
setup.py
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10066
src/apps/GBaseApp.py
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10038
src/base/log.py reinhard.muel...@bytewise.at-20100503115129-uvondrz5bvkqubyv
src/base/setup.py
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:10034
src/rpc/drivers/xmlrpc/typeconv.py
svn-v3-single1-dHJ1bmsvZ251ZS1jb21tb24.:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-common:9954
Modified: trunk/gnue-common/setup-bzr.py
===================================================================
--- trunk/gnue-common/setup-bzr.py 2010-10-28 20:59:53 UTC (rev 10229)
+++ trunk/gnue-common/setup-bzr.py 2010-11-02 09:21:52 UTC (rev 10230)
@@ -260,7 +260,7 @@
# First of all, make sure this is a current enough Python release.
try:
- if sys.hexversion < 0x02000000:
+ if sys.hexversion < 0x02050000:
raise AttributeError
except AttributeError:
@@ -268,12 +268,12 @@
print """
You are running Python %s.
- GNU Enterprise requires at least Python 2.0 (recommended: 2.1+).
+ GNU Enterprise requires at least Python 2.5.
If you have a later version installed, you should run setup.py
- against that version. For example, if you have Python 2.1
+ against that version. For example, if you have Python 2.5
installed, you may need to run:
- python2.1 %s
+ python2.5 %s
""" % (string.split(sys.version)[0], sys.argv[0])
print "-" * 70
Modified: trunk/gnue-common/setup.py
===================================================================
--- trunk/gnue-common/setup.py 2010-10-28 20:59:53 UTC (rev 10229)
+++ trunk/gnue-common/setup.py 2010-11-02 09:21:52 UTC (rev 10230)
@@ -149,19 +149,19 @@
# -----------------------------------------------------------------------------
try:
- if sys.hexversion < 0x02030000:
+ if sys.hexversion < 0x02050000:
raise AttributeError
except AttributeError:
print "-" * 70
print """
You are running Python %s.
-GNU Enterprise requires at least Python 2.3.
+GNU Enterprise requires at least Python 2.5.
If you have a later version installed, you should run setup.py
-against that version. For example, if you have Python 2.3
+against that version. For example, if you have Python 2.5
installed, you may need to run:
-python2.3 setup.py
+python2.5 setup.py
""" % sys.version.split()[0]
print "-" * 70
sys.exit(1)
Modified: trunk/gnue-common/src/apps/GBaseApp.py
===================================================================
--- trunk/gnue-common/src/apps/GBaseApp.py 2010-10-28 20:59:53 UTC (rev
10229)
+++ trunk/gnue-common/src/apps/GBaseApp.py 2010-11-02 09:21:52 UTC (rev
10230)
@@ -229,10 +229,10 @@
os.path.join(paths.config, "connections.conf")) ]
# Python version check
- if not hasattr(sys, 'hexversion') or sys.hexversion < 0x02030000:
- msg = u_("This application requires Python 2.3 or greater.")
+ if not hasattr(sys, 'hexversion') or sys.hexversion < 0x02050000:
+ msg = u_("This application requires Python 2.5 or greater.")
if hasattr(sys, 'version'):
- msg = u_("This application requires Python 2.3 or greater. "
+ msg = u_("This application requires Python 2.5 or greater. "
"You are running Python %s") % sys.version[:5]
raise errors.AdminError, msg
Modified: trunk/gnue-common/src/base/log.py
===================================================================
--- trunk/gnue-common/src/base/log.py 2010-10-28 20:59:53 UTC (rev 10229)
+++ trunk/gnue-common/src/base/log.py 2010-11-02 09:21:52 UTC (rev 10230)
@@ -129,16 +129,11 @@
If this decorator is applied to a function, every call to that function is
logged on C{DEBUG} level.
- Usage with Python 2.4 or later::
+ Usage::
@logged_f
myfunction(self, foo, bar):
:
- Usage with Python 2.3::
- myfunction(self, foo, bar):
- :
- myfunction=logged_f(myfunction)
-
@param func: Function to put the logging wrapper around.
@type func: function
@return: Function with the logging wrapper.
@@ -162,16 +157,11 @@
If this decorator is applied to a function, every call to that function
issues a deprecation warning.
- Usage with Python 2.4 or later::
+ Usage::
@deprecated_f
myfunction(self, foo, bar):
:
- Usage with Python 2.3::
- myfunction(self, foo, bar):
- :
- myfunction=deprecated_f(myfunction)
-
@param func: Function to put the deprecation warning wrapper around.
@type func: function
@return: Function with the deprecation warning wrapper.
@@ -196,16 +186,11 @@
If this decorator is applied to a function, every call to that function is
logged on C{DEBUG} level.
- Usage with Python 2.4 or later::
+ Usage::
@logged_f_n('my.logger.name')
myfunction(self, foo, bar):
:
- Usage with Python 2.3::
- myfunction(self, foo, bar):
- :
- myfunction=logged_f_n('my.logger.name')(myfunction)
-
@param name: Logger name to use.
@type name: string
@return: A function that accepts a function as argument and returns the
@@ -232,16 +217,11 @@
If this decorator is applied to a function, every call to that function
issues a deprecation warning.
- Usage with Python 2.4 or later::
+ Usage::
@deprecated_f_n('my.logger.name')
myfunction(self, foo, bar):
:
- Usage with Python 2.3::
- myfunction(self, foo, bar):
- :
- myfunction=deprecated_f_n('my.logger.name')(myfunction)
-
@param name: Logger name to use.
@type name: string
@return: A function that accepts a function as argument and returns the
Modified: trunk/gnue-common/src/base/setup.py
===================================================================
--- trunk/gnue-common/src/base/setup.py 2010-10-28 20:59:53 UTC (rev 10229)
+++ trunk/gnue-common/src/base/setup.py 2010-11-02 09:21:52 UTC (rev 10230)
@@ -152,7 +152,7 @@
# -----------------------------------------------------------------------------
try:
- if sys.hexversion < 0x02030000:
+ if sys.hexversion < 0x02050000:
raise AttributeError
except AttributeError:
@@ -160,12 +160,12 @@
print """
You are running Python %s.
-GNU Enterprise requires at least Python 2.3.
+GNU Enterprise requires at least Python 2.5.
If you have a later version installed, you should run setup.py
-against that version. For example, if you have Python 2.3
+against that version. For example, if you have Python 2.5
installed, you may need to run:
-python2.3 setup.py
+python2.5 setup.py
""" % sys.version.split()[0]
print "-" * 70
sys.exit(1)
Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/typeconv.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/typeconv.py 2010-10-28
20:59:53 UTC (rev 10229)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/typeconv.py 2010-11-02
09:21:52 UTC (rev 10230)
@@ -132,13 +132,8 @@
result = {}
for (key, val) in value.items ():
- # Workaround for a bug xmlrpclib <= Python 2.3.4: No Unicode strings
- # possible as dictionary keys.
- if isinstance (key, unicode):
- key = key.encode ('utf-8')
-
- # Another deficiency in xmlrpclib: No <None> values as dictionary keys
- elif key is None:
+ # A deficiency in xmlrpclib: No <None> values as dictionary keys
+ if key is None:
key = ''
elif not isinstance (key, str):
_______________________________________________
commit-gnue mailing list
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
