Commit e4d20950 authored by Jim Fulton's avatar Jim Fulton

Added code to overcome Python 1.3 bug in string conversion functions.

parent 22ae7b71
...@@ -504,7 +504,7 @@ Publishing a module using Fast CGI ...@@ -504,7 +504,7 @@ Publishing a module using Fast CGI
o Configure the Fast CGI-enabled web server to execute this o Configure the Fast CGI-enabled web server to execute this
file. file.
$Id: Publish.py,v 1.27 1996/12/30 14:36:12 jim Exp $""" $Id: Publish.py,v 1.28 1997/01/08 23:22:45 jim Exp $"""
#' #'
# Copyright # Copyright
# #
...@@ -557,6 +557,9 @@ $Id: Publish.py,v 1.27 1996/12/30 14:36:12 jim Exp $""" ...@@ -557,6 +557,9 @@ $Id: Publish.py,v 1.27 1996/12/30 14:36:12 jim Exp $"""
# (540) 371-6909 # (540) 371-6909
# #
# $Log: Publish.py,v $ # $Log: Publish.py,v $
# Revision 1.28 1997/01/08 23:22:45 jim
# Added code to overcome Python 1.3 bug in string conversion functions.
#
# Revision 1.27 1996/12/30 14:36:12 jim # Revision 1.27 1996/12/30 14:36:12 jim
# Fixed a spelling error. # Fixed a spelling error.
# #
...@@ -672,7 +675,7 @@ $Id: Publish.py,v 1.27 1996/12/30 14:36:12 jim Exp $""" ...@@ -672,7 +675,7 @@ $Id: Publish.py,v 1.27 1996/12/30 14:36:12 jim Exp $"""
# #
# #
# #
__version__='$Revision: 1.27 $'[11:-2] __version__='$Revision: 1.28 $'[11:-2]
def main(): def main():
...@@ -1130,17 +1133,23 @@ def field2string(v): ...@@ -1130,17 +1133,23 @@ def field2string(v):
def field2int(v): def field2int(v):
try: v=v.read() try: v=v.read()
except: v=str(v) except: v=str(v)
return string.atoi(v) # we can remove the check for an empty string when we go to python 1.4
if v: return string.atoi(v)
raise ValueError, 'Empty entry when integer expected'
def field2float(v): def field2float(v):
try: v=v.read() try: v=v.read()
except: v=str(v) except: v=str(v)
return string.atof(v) # we can remove the check for an empty string when we go to python 1.4
if v: return string.atof(v)
raise ValueError, 'Empty entry when floating-point number expected'
def field2long(v): def field2long(v):
try: v=v.read() try: v=v.read()
except: v=str(v) except: v=str(v)
return string.atol(v) # we can remove the check for an empty string when we go to python 1.4
if v: return string.atol(v)
raise ValueError, 'Empty entry when integer expected'
def field2Regex(v): def field2Regex(v):
try: v=v.read() try: v=v.read()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment