[Erp5-report] r40628 kazuhiko - in /erp5/trunk/utils/pysvn: Docs/ Examples/Client/ Import/p...
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Nov 24 22:34:56 CET 2010
Author: kazuhiko
Date: Wed Nov 24 22:34:56 2010
New Revision: 40628
URL: http://svn.erp5.org?rev=40628&view=rev
Log:
call 'python setup.py backport' under Source directory to support python 2.5 or earlier.
Modified:
erp5/trunk/utils/pysvn/Docs/generate_cpp_docs_from_html_docs.py
erp5/trunk/utils/pysvn/Examples/Client/svn_cmd.py
erp5/trunk/utils/pysvn/Import/pycxx-6.2.1/Demo/Python3/test_simple.py
erp5/trunk/utils/pysvn/Source/pysvn/__init__.py.template
erp5/trunk/utils/pysvn/Source/setup_backport_probe.py
erp5/trunk/utils/pysvn/Source/setup_configure.py
erp5/trunk/utils/pysvn/Tests/benchmark_diff.py
erp5/trunk/utils/pysvn/Tests/test_07_copy2.py
erp5/trunk/utils/pysvn/Tests/test_07_move2.py
erp5/trunk/utils/pysvn/Tests/test_callbacks.py
Modified: erp5/trunk/utils/pysvn/Docs/generate_cpp_docs_from_html_docs.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Docs/generate_cpp_docs_from_html_docs.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Docs/generate_cpp_docs_from_html_docs.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Docs/generate_cpp_docs_from_html_docs.py [utf8] Wed Nov 24 22:34:56 2010
@@ -17,7 +17,7 @@ def main( argv ):
debug.enable( '--debug' in argv )
try:
parser = XhtmlParser( open( html_doc ).read() )
- except ParseException as e:
+ except ParseException, e:
print( repr(e) )
print( str(e) )
return 1
@@ -78,7 +78,7 @@ class XhtmlParser:
try:
self.dom = xml.dom.minidom.parseString( definition_text )
- except xml.parsers.expat.ExpatError as e:
+ except xml.parsers.expat.ExpatError, e:
raise ParseException( 'Ln:%d Col:%d %s' % (e.lineno, e.offset, e.args[0]) )
def htmlToCpp( self ):
Modified: erp5/trunk/utils/pysvn/Examples/Client/svn_cmd.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Examples/Client/svn_cmd.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Examples/Client/svn_cmd.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Examples/Client/svn_cmd.py [utf8] Wed Nov 24 22:34:56 2010
@@ -261,12 +261,12 @@ class SvnCommand:
self.printNotifyMessages()
- except pysvn.ClientError as e:
+ except pysvn.ClientError, e:
self.printNotifyMessages()
print( e.args[0] )
return 1
- except CommandError as e:
+ except CommandError, e:
self.printNotifyMessages()
print( e.reason() )
return 1
@@ -1107,7 +1107,7 @@ class SvnArguments:
try:
date = parse_datetime.parse_time( rev_string[1:-2] )
return pysvn.Revision( pysvn.opt_revision_kind.date, date )
- except parse_datetime.DateTimeSyntaxError as e:
+ except parse_datetime.DateTimeSyntaxError, e:
raise CommandError( e.reason() )
# either a rev number or a date
try:
Modified: erp5/trunk/utils/pysvn/Import/pycxx-6.2.1/Demo/Python3/test_simple.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Import/pycxx-6.2.1/Demo/Python3/test_simple.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Import/pycxx-6.2.1/Demo/Python3/test_simple.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Import/pycxx-6.2.1/Demo/Python3/test_simple.py [utf8] Wed Nov 24 22:34:56 2010
@@ -59,7 +59,7 @@ try:
print( 'Error: did not raised RuntimeError' )
sys.exit( 1 )
-except RuntimeError as e:
+except RuntimeError, e:
print( 'Raised %r' % (str(e),) )
new_style_class = None
Modified: erp5/trunk/utils/pysvn/Source/pysvn/__init__.py.template
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/pysvn/__init__.py.template?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/pysvn/__init__.py.template [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/pysvn/__init__.py.template [utf8] Wed Nov 24 22:34:56 2010
@@ -137,7 +137,7 @@ try:
if not key.startswith( '__' ):
globals()[ key ] = value
-except ImportError as e:
+except ImportError, e:
# check for common installation errors that show up as ImportError
if ': undefined symbol:' in str(e):
raise ImportError( 'pysvn was built against newer (svn, apr, etc.) libraries then the ones installed on this system. %s' % str(e) )
Modified: erp5/trunk/utils/pysvn/Source/setup_backport_probe.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/setup_backport_probe.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/setup_backport_probe.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/setup_backport_probe.py [utf8] Wed Nov 24 22:34:56 2010
@@ -14,5 +14,5 @@
#
try:
pass
-except ValueError as e:
+except ValueError, e:
pass
Modified: erp5/trunk/utils/pysvn/Source/setup_configure.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Source/setup_configure.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Source/setup_configure.py [utf8] Wed Nov 24 22:34:56 2010
@@ -54,7 +54,7 @@ def cmd_configure( argv ):
creater = MakeFileCreater()
return creater.createMakefile( argv )
- except SetupError as e:
+ except SetupError, e:
print( 'Error:',str(e) )
return 1
@@ -918,7 +918,7 @@ LDLIBS= \
'/usr/local/include/apache2', # alternate *BSD
],
'apr.h' )
- except SetupError as e:
+ except SetupError, e:
last_exception = e
raise last_exception
@@ -956,7 +956,7 @@ LDLIBS= \
'/usr/pkg/lib', # netbsd
],
apr_libname )
- except SetupError as e:
+ except SetupError, e:
last_exception = e
raise last_exception
Modified: erp5/trunk/utils/pysvn/Tests/benchmark_diff.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Tests/benchmark_diff.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Tests/benchmark_diff.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Tests/benchmark_diff.py [utf8] Wed Nov 24 22:34:56 2010
@@ -206,7 +206,7 @@ def main( argv ):
print( 'Info: Test succeeded' )
return 0
- except IOError as e:
+ except IOError, e:
print( 'Error: %s' % e )
return 2
Modified: erp5/trunk/utils/pysvn/Tests/test_07_copy2.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Tests/test_07_copy2.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Tests/test_07_copy2.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Tests/test_07_copy2.py [utf8] Wed Nov 24 22:34:56 2010
@@ -29,7 +29,7 @@ print( 'Info: Copy2 will raise error' )
try:
c.copy2( src_list, 'wc_copy_3', make_parents=True )
-except pysvn.ClientError as e:
+except pysvn.ClientError, e:
print( 'Info: Error: %r' % e.args[0] )
for message, code in e.args[1]:
print( 'Info: Code: %d, Message: %r' % (code, message) )
Modified: erp5/trunk/utils/pysvn/Tests/test_07_move2.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Tests/test_07_move2.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Tests/test_07_move2.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Tests/test_07_move2.py [utf8] Wed Nov 24 22:34:56 2010
@@ -20,7 +20,7 @@ print( 'Info: Move2 will raise error' )
try:
c.move2( src_list, 'wc_move_3', make_parents=True )
-except pysvn.ClientError as e:
+except pysvn.ClientError, e:
print( 'Info: Error: %r' % e.args[0] )
for message, code in e.args[1]:
print( 'Info: Code: %d, Message: %r' % (code, message) )
Modified: erp5/trunk/utils/pysvn/Tests/test_callbacks.py
URL: http://svn.erp5.org/erp5/trunk/utils/pysvn/Tests/test_callbacks.py?rev=40628&r1=40627&r2=40628&view=diff
==============================================================================
--- erp5/trunk/utils/pysvn/Tests/test_callbacks.py [utf8] (original)
+++ erp5/trunk/utils/pysvn/Tests/test_callbacks.py [utf8] Wed Nov 24 22:34:56 2010
@@ -59,7 +59,7 @@ class Test:
self.client.copy(
'http://liara/svn/barrys-test-lib/trunk/fred/testing/bar.txt',
'http://liara/svn/barrys-test-lib/trunk/fred/testing/bar99.txt' )
- except pysvn.ClientError as e:
+ except pysvn.ClientError, e:
if expected is None:
self.failed( 'unexpected exception: %s' % e )
More information about the Erp5-report
mailing list