Checkout Tools
  • last updated 7 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
On branch swig-py3: Fix test for swig-py on Windows

* subversion/bindings/swig/python/tests/client.py:

(SubversionClientTestCase.test_merge_peg3): Concern platform specific

new line style.

(SubversionClientTestCase.test_conflict): Discriminate between local path

and canonical path

(SubversionClientTestCase.test_shelf): Discriminate between local path

and canonical path

Reported by: jcorvel

On branch swig-py3: Fix test after merging shelving-v3

* subversion/bindings/swig/python/tests/client.py:

(SubversionClientTestCase.test_shelf): Relax assert condition to be suitable

for changed behavior of shelved_func callback in

svn_client__shelf_save_new_version3().

On branch swig-py3: Allow str return to svn_client_get_commit_log3_t callback

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:

(svn_swig_py_get_commit_log_func): Allow result as unicode object

* subversion/bindings/swig/python/tests/client.py:

(SubversionClientTestCase.make_log_message_func): New helper function

(SubversionClientTestCase.test_get_commit_log3_callback_accept_unicode):

New test case

(SubversionClientTestCase.test_get_commit_log3_callback_unicode_error):

New test case

  1. … 1 more file in changeset.
On branch swig-py3: accept both of bytes/str for input char * arguments

* Replace typemap(in) for char * using 'parse' modifier with one using

function allows both of bytes/str in py2/py3 in libsvn_swig_py library

* Fix functions to convert Python objects into char pointer to accept

both of bytes/str object in py2/py3

* Fix to accept None as representation of NULL value on conversion

prop dict into apr_hash_t * and apr_array_header_t * of svn_props_t *

[In subversion/bindings/swig]

* core.i (%typemap(in) (const char *data, apr_size_t *len): Allow str

as well as bytes for data argment of svn_stream_write()

* include/svn_global.swg

(remove)(%typemap(in) char *, char const *, char * const,

char const * const): Move this typemap into include/svn_strings as

typemap (in) IN_STRING

* include/svn_string.swg (new)(%typemap(in) IN_STRING): replacement of

%typemap(in) char *, char const *, char * const, char const * const.

actual processing code is moved new svn_swig_py_string_to_cstring()

function in python/libsvn_swig_py/swigutil_py.c

* include/svn_types.swg (%typemap(in) const char *MAY_BE_NULL):

Move processing code into new svn_swig_py_string_to_cstring() function

in python/libsvn_swig_py/swigutil_py.c

* python/libsvn_swig_py/swigutil_py.c

(svn_swig_py_string_to_cstring): New function to convert Python

bytes or str into const char *, with better TypeError exception message

(svn_swig_py_string_type_exception): New function to construct

TypeError exception for new make_string_from_ob_maybe_null() function

(make_string_from_ob, make_svn_string_from_ob):

- Allow str as well as bytes for ob

- Don't raise TypeError exception because all callers don't expect it

(make_string_from_ob_maybe_null, make_svn_string_from_ob_maybe_null):

New function same as make_string_from_ob() and make_svn_string_fromob()

but allows None input represents NULL value and raise TypeError

if input value don't have appropriate type

(svn_swig_py_stringhash_from_dict, svn_swig_py_mergeinfo_from_dict,

svn_swig_py_proparray_from_dict, svn_swig_py_prophash_from_dict,

svn_swig_py_path_rev_hash_from_dict,

svn_swig_py_struct_ptr_hash_from_dict): separate check of key conversion

result and value conversion result

(svn_swig_py_proparray_from_dict, svn_swig_py_prophash_from_dict):

allow NULL for prop values

(svn_swig_py_unwrap_string):

- Allow str as well as bytes for source argument

(svn_swig_py_make_file):

- Allow str as well as bytes for py_file argument as file path

(svn_swig_py_auth_gnome_keyring_unlock_prompt_func):

- Use new function make_string_from_ob_maybe_null() instead of

make_string_from_ob() to check TypeError

- Report Python exception caused by Python callback function as

callback exception error

* python/libsvn_swig_py/swigutil_py.h

Expose new public function make_string_from_ob_maybe_null(), which is

used by typemap(in) char IN_STRING, typemap(in) const char *MAY_BY_NULL

* python/tests/client.py

(SubversionClientTestCase.log_entry_receiver_whole): New helper

callback function for new SubversionClientTestCase.test_log5_revprops

(SubversionClientTestCase.test_log5_revprops): new test for

typemap(in) apr_array_t *STRINGLIST and its helper function

svn_swig_py_unwrap_string()

* python/tests/core.py

(SubversionCoreTestCase.test_stream_write_exception):

- As unicode input is now valid, use int value as invalid input

- Add case to be expected to cause UnicodeEncodeError

(SubversionCoreTestCase.test_stream_write_str):(Only for Python 3)

New test case for svn_stream_write() to pass str object as data argument

(SubversionCoreTestCase.test_stream_write_bytes):

Renamed from SubversionCoreTestCase.test_stream_write

* python/tests/run_all.py: Register new test module typemap

* python/tests/typemap.py: New unittest module for typemaps

(SubversionTypemapTestCase): New unittest subclass for unit test about

typemaps

(SubversionTypemapTestCase.test_char_ptr_in): New test case

(SubversionTypemapTestCase.test_char_ptr_in_unicode_exception):

New test case

(SubversionTypemapTestCase.test_char_ptr_may_be_null): New test case

(SubversionTypemapTestCase.test_char_ptr_may_be_null_unicode_exception):

New test case

(SubversionTypemapTestCase.test_make_string_from_ob): New test case

(SubversionTypemapTestCase.test_prophash_from_dict_null_value):

New test case

(SubversionTypemapTestCase.test_make-string_ob_unicode_exception):

New test case

(SubversionTypemapTestCase.test_make_svn_string_ob_unicode_exception):

New test case

(suite): New function to drive SubversionTypemapTestCase

  1. … 9 more files in changeset.
On branch swig-py3: Revise encode/decode usage in swig-py unit test.

[in subversion/bindings/swig/python/tests]

* client.py (SubversionClientTestCase.test_update4): Don't encode os.path.sep

if it is already a bytes object.

* core.py (SubversionCoreTestCase.test_stream_write): Don't encode fname

if it is already a bytes object.

* delta.py (DeltaTestCase.testTxWindowHandler_stream_IF,

DeltaTestCase.testTxWindowHandler_Stream_IF): Don't encode fname if it

is already a bytes object.

* fs.py (SubversionFSTestCase.setUp): Don't encode self.tmpfile if it is

already a bytes object.

* trac/versioncontrol/svn_fs.py

Remove unnecessary variable IS_PY3 and therefore unnecessary import of

sys module.

(SubversionNode.__init__): Don't use IS_PY3 condition, just store a unicode

string in the exception object.

* utils.py (Temper.alloc_empty_dir, Temper.alloc_empty_repo): Ensure suffix

arg for tempfile.mkdtemp() is unicode (for py3 < 3.5).

Patch By: Yasuhito Futatsuki <futatuki@poem.co.jp>

  1. … 5 more files in changeset.
On branch swig-py3: Fix tests after str to bytes API conversion.

* subversion/bindings/swig/python/tests/client.py

(SubversionClientTestCase.test_conflict,

SubversionClientTestCase.test_shelf)): Construct paths as bytes instead of

str.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

(svn_swig_py_client_status_func): The path given to the callback should be

bytes instead of str for consistency with the rest of the API.

  1. … 1 more file in changeset.
On branch swig-py3: Use bytes for all API string parameters.

Since many string like arguments in the API can contain arbitrary bytes, use the

Python Bytes interface in Python 3, while still using Str in Python 2, to ensure

full compatibility with all possible input data.

Build system change:

* build/ac-macros/swig.m4:

Add "-DPY3" option to SWIG_PY_OPTS for py3 build to define symbol to switch

typemap between py2 and py3.

Typemap changes:

* subversion/bindings/swig/core.i

(%typemap(argout) (char *buffer, apr_size_t *len):

Map buffer arg to Bytes insted of Str.

(%typemap(in) (const char *data, apr_size_t *len) ($*2_type temp):

Map data arg to Bytes instead of Str and pass Py_ssize_t variable as length

argment of PyBytes_AsStringAndSize for for explicit type conversion.

(%typemap(in) const void *value):

Map value arg to Bytes instead of Str for svn_auth_set_parameter().

* subversion/bindings/swig/include/svn_global.swg:

- Define SWIG_PYTHON_STRICT_BYTE_CHAR symbol for swig context for

Python3.

- Switch "in" type typemap for char *, char const *, char * const,

and char const * const "", to use parse parameter "y" for py3 and

"s" for py2.

* subversion/bindings/swig/include/svn_string.swg

(%typemap(argout) RET_STRING, %typemap(in) svn_stringbuf_t *,

%typemap(out) svn_stringbuf_t *, %typemap(in) const svn_string_t *,

%typemap(out) svn_string_t *, %typemap(argout) const char **OUTPUT):

Map args to Bytes instead of Str.

* subversion/bindings/swig/include/svn_swigcompat.swg

(%set_constant(name, value): Use PyDict_SetItem and PyBytes_FromString

instead of PyDict_SetItemString, for SWIG <= 1.3.27 (not tested).

* subversion/bindings/swig/include/svn_types.swg

(%typemap(in) const char *MAY_BE_NULL): Don't use "z" conversion

format and convert to Bytes if it is not NULL.

(%typemap(in) (const char *PTR, apr_size_t LEN): Use PyBytes_Check and

PyBytes_AsStringAndSize instead of PyStr_Check and PyStr_AsUTF8AndSize.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

(make_string_from_ob(), make_svn_string_from_ob(),

svn_swig_py_make_file(), svn_swig_py_get_commit_log_func()):

Use PyBytes_Check and PyBytes_AsString instead of PyStr_Check and

PyStr_AsString.

(convert_hash()): Use Dict_SetItem and PyBytes_FromString instead of

DictItemString.

(convert_svn_string_t(), svn_swig_py_proparray_to_dict(),

ra_callbacks_get_wc_prop()):

Use PyBytes_AsStringAndSize instead of PyStr_AsUTF8AndSize.

(cstring_to_pystring(), convert_string(),

svn_swig_py_propinheriteditemarray_to_dict(),

svn_swig_py_proparray_to_dict(),

svn_swig_py_locationhash_to_dict(),

svn_swig_py_c_strings_to_list(),

svn_swig_py_changed_path_hash_to_dict(),

svn_swig_py_changed_path2_hash_to_dict(),

svn_swig_py_unwrap_string(),

svn_swig_py_array_to_list()): Use PyBytes_FromString instead of

PyStr_FromString.

(delete_entry(), add_directory(), open_directory(), change_dir_prop(),

add_file(), open_file(), apply_textdelta(), change_file_prop(),

close_file(), parse_fn3_uuid_record(), parse_fn3_set_revision_property(),

parse_fn3_set_node_property(), parse_fn3_delete_node_property(),

svn_swig_py_notify_func(), svn_swig_py_status_func(),

svn_swig_py_delta_path_driver_cb_func(), svn_swig_py_status_func2(),

svn_swig_py_fs_lock_callback(), svn_swig_py_repos_authz_func(),

svn_swig_py_repos_history_func(), svn_swig_py_proplist_receiver2(),

svn_swig_py_log_receiver(), svn_swig_py_info_receiver_func(),

svn_swig_py_client_blame_receiver_func(),

svn_swig_py_changelist_receiver_func(),

svn_swig_py_auth_gnome_keyring_unlock_prompt_func(),

svn_swig_py_auth_simple_prompt_func(),

svn_swig_py_auth_username_prompt_func(),

svn_swig_py_auth_ssl_server_trust_prompt_func(),

svn_swig_py_auth_ssl_client_cert_prompt_func(),

svn_swig_py_auth_ssl_client_cert_pw_prompt_func(),

svn_swig_py_config_auth_walk_func(), ra_callbacks_get_wc_prop(),

ra_callbacks_push_or_set_wc_prop(), ra_callbacks_invalidate_wc_props(),

svn_swig_py_commit_callback(), svn_swig_py_ra_file_rev_handler_func(),

svn_swig_py_ra_lock_callback(), reporter_set_path(),

reporter_delete_path(), reporter_link_path(),

wc_diff_callbacks2_file_changed_or_added(),

wc_diff_callbacks2_file_deleted(), wc_diff_callbacks2_dir_added(),

wc_diff_callbacks2_dir_deleted(),

wc_diff_callbacks2_dir_props_changed(),

svn_swig_py_config_enumerator2(),

svn_swig_py_config_section_enumerator2()): Use 's' for py2 and use 'y'

for py3 in argment format string.

(ra_callbacks_push_or_set_wc_prop()): Use PyBytes_FromStringAndSize

instead of PyStr_FromStringAndSize.

(ra_callbacks_get_client_string()): Use PyBytes_FromString instaed of

PyStr_AsString.

* subversion/bindings/swig/svn_client.i

(%typemap(argout) apr_array_header_t **props):

Use PyBytes_FromStringAndSize() instead of PyStr_FromStringAndSize.

Helper python code changes:

* subversion/bindings/swig/python/svn/core.py

(svn_path_compare_paths): Do not use cmp, for py3 compatibility.

(Stream.read()): Chunks is now list of bytes, not list of str.

* subversion/bindings/swig/python/svn/fs.py

(FileDiff.get_pipe()):

- Make sure self.tempfile1 and self.self.tempfile2 are bytes.

- Pass bytes to header_encoding arg in _svndiff.file_output_unified4().

* subversion/bindings/swig/python/svn/ra.py

(Callbacks..__doc__):

Treat path as bytes in sample code.

* subversion/bindings/swig/python/svn/repos.py

(ChangeCollector._make_base_path()): Treat path as bytes.

(ChangeCollector.open_root(): Path and basepath should be bytes in

dir_baton.

(RevisionChangeCollector._make_base_path()): Treat path as bytes.

Unit test changes:

* subversion/bindings/swig/python/tests/auth.py:

Replace all str literals with bytes literals except docstring and module name.

* subversion/bindings/swig/python/tests/checksum.py

(ChecksumTestCases.test_checksum()): Check if type of check_val is

bytes instead of str.

* subversion/bindings/swig/python/tests/client.py:

Replace all str literals with bytes literals except for the mode arg of open(),

arguments to utils.Temper methods, docstrings, and module names.

(SubversionClientTestCase.test_uuid_from_url): Check if return value

type client.uuid_from_url() is bytes instead of str.

(SubversionClientTestCase.test_uuid_from_path): Check if return value

type client.uuid_from_path() is bytes instead of str.

(SubversionClientTestCase.test_merge_peg3()): Open the result file in

raw mode.

(SubversionClientTestCase.test_update4()): Convert os.path.sep into

bytes if it is str in py3.

* subversion/bindings/swig/python/tests/core.py:

Replace all str literals with bytes literals except for exception messages,

arguments to utils.Temper methods, docstrigs, and module names.

Add new tests for svn_stream_*()

(SubversionCoreTestCase.test_stream_from_stringbuf()): New test method.

(SubversionCoreTestCase.test_stream_read_full()): New test method.

(SubversionCoreTestCase.test_stream_read2()): New test method.

(SubversionCoreTestCase.test_stream_write_exception()): New test method.

(SubversionCoreTestCase.test_stream_write()): New test method.

(SubversionCoreTestCase.test_stream_readline()): New test method.

* subversion/bindings/swig/python/tests/delta.py

(DeltaTestCase.estTxWindowHandler_stream_IF(),

DeltaTestCase.estTxWindowHandler_Stream_IF()):

Use bytes literals to make stream when using

svn.core.svn_stream_from_stringbuf().

Use bytes file name to make stream when using

svn.core.svn_stream_from_aprfile2().

* subversion/bindings/swig/python/tests/fs.py

(SubversionFSTestCase.log_message_func(): log_msg_func3 callback now

expects bytes to return.

(SubversionFSTestCase.setUp()): Pass bytes path and url to client.import2().

(SubversionFSTestCase.test_diff_repos_paths_internal(),

SubversionFSTestCase.test_diff_repos_paths_external()): Use bytes for

path1 argument to fs.FileDiff.__init__().

* subversion/bindings/swig/python/tests/mergeinfo.py

(SubversionMergeinfoTestCase.TEXT_MERGEINFO1,

SubversionMergeinfoTestCase.TEXT_MERGEINFO2,

SubversionMergeinfoTestCase.MERGEINFO_SRC): Use bytes instead of str.

(SubversionMergeinfoTestCase.test_mergeinfo_get()):

- Pass list of bytes for paths arg to repos.fs_get_mergeinfo().

- Replace str in expected_mergeinfo with bytes.

* subversion/bindings/swig/python/tests/ra.py

Replace all str literals with bytes literals except assertion message,

arguments to utils.Temper methods, docstrings, and module names.

(SubversionRepositoryAccessTestCase.test_get_file): Compare file

content as bytes.

* subversion/bindings/swig/python/tests/repository.py

Replace all str literals with bytes literals when passed into or returned from

the Subversion API, except exception messages.

(SubversionRepositoryTestCase.test_dump_fs2()): Treat dump and

feedback as bytes and compose expected_feedback as bytes.

* subversion/bindings/swig/python/tests/utils.py

(Temper.alloc_empty_dir(),

Temper.alloc_empty_repo): Convert return value of tempfile.mkdtemp() into

bytes.

(Temper.file_uri_for_path()): Return URI as bytes.

* subversion/bindings/swig/python/tests/wc.py

Replace all str literals with bytes literals when passed into or returned from

the Subversion API, except exception messages.

(SubversionWorkingCopyTestCase.test_get_adm_dir()): Check type as

bytes.

(SubversionWorkingCopyTestCase.test_get_pristine_copy_path(),

SubversionWorkingCopyTestCase.test_diff_editor4()): Open file in raw mode.

(SubversionWorkingCopyTestCase.test_commit()): Use bytes literals

instead of str.

* subversion/bindings/swig/python/tests/trac/versioncontrol/main.py

(Node.DIRECTORY, Node.FILE): Replace str with bytes.

(Node.__init__): Do not convert path to str.

(Node.get_name): Treat self.path as bytes.

(Changeset.ADD, Changeset.COPY, Changeset.DELETE, Changeset.EDIT,

Changeset.MOVE): Replace str with bytes.

* subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py

(SubversionRepository.__init__(),

SubversionRepository.get_oldest_rev(),

SubversionRepository.youngest_rev(),

SubversionRepository.next_rev()): Treat self.path and self.scope as bytes.

(SubversionRepository.normalize_path(),

SubversionRepository.get_node()): Treat path as bytes.

(SubversionRepository.get_path_history()): Replace 'unknown' Changeset value

with bytes.

(SubversionRepository.get_deltas()): Replace str 'entry' arg to

repos.svn_repos_dir_delta() with bytes.

(SubversionNode.__init__()):

- Treat self.path and self.scope as bytes.

- Decode path into str for exception message on py3.

(SubversionNode.get_entries()): Treat self.path as bytes.

(SubversionNode.get_properties()): Property values are bytes, not str.

(DiffChangeEditor.open_root()): Return bytes value.

* subversion/bindings/swig/python/tests/trac/versioncontrol/tests/svn_fs.py

Replace all str literals with bytes literals when passed into or returned from

the Subversion API, except exception messages.

(REPOS_URL) Build REPOS_URL as bytes.

Patch By: Yasuhito FUTATSUKI <futatuki@poem.co.jp>

  1. … 25 more files in changeset.
On branch swig-py3: Complete Python SWIG bindings for svn_client.h.

* subversion/bindings/swig/include/svn_containers.swg

(apr_array_header_t **OUTPUT_OF_CONST_CHAR_P): Add additional "char *" array

maps.

(%typemap(argout) apr_array_header_t **options): New output mapping for array

of svn_client_conflict_option_t objects.

(%typemap(argout) apr_array_header_t **versions_p): New output mapping for

array of svn_client__shelf_version_t objects.

* subversion/bindings/swig/include/svn_string.swg

(const char **OUTPUT): Add additional char * output parameter for log_message.

* subversion/bindings/swig/include/svn_types.swg

(SWIGTYPE **OUTPARAM): Add several missing output parameter swig types.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,

subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h

Add make_ob_* swig constructor for svn_client_status_dup.

(svn_swig_py_client_status_func): New Function.

* subversion/bindings/swig/svn_client.i

Add callback typemaps for usages of svn_client_status_func_t.

* subversion/bindings/swig/python/tests/client.py

(SubversionClientTestCase.assert_all_instances_of): New helper method.

(SubversionClientTestCase.test_platform_providers): Add usage of

assert_all_instances_of() helper method.

(SubversionClientTestCase.test_conflict): New test method.

(SubversionClientTestCase.test_shelf): New test method.

  1. … 6 more files in changeset.
On branch swig-py3: Remove use of hasattr() in python bindings since it can be

subtly different between Python 2 and 3.

* subversion/bindings/swig/include/proxy_apr.swg,

subversion/bindings/swig/python/tests/client.py,

subversion/bindings/swig/python/tests/mergeinfo.py,

subversion/bindings/swig/python/tests/trac/versioncontrol/svn_fs.py

(_mark_weakpool_invalid,

apr_pool_t.valid,

apr_pool_t.destroy

apr_pool_t._wrap,

testGnomeKeyring,

get_svn_merge_range_t_objects,

_get_history): Remove use of hasattr() to ensure consistent behavior with

both Python 2 and 3.

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

(svn_swig_ensure_valid_swig_wrapper): New private function for common wrapper

validation code.

(svn_swig_py_convert_ptr, svn_swig_py_must_get_ptr): Use new wrapper

validation function.

  1. … 4 more files in changeset.
On branch swig-py3: Update swig python code to be compatible with both Python 2

and Python3.

Change non-generated python code to use syntax that is valid for both Python 3

and Python 2.7. Where this is not possible, provide compatibility wrappers.

Python 2 unit tests all pass after the changes, but more effort remains for full

Python 3 functionality.

* build/generator/swig/header_wrappers.py

(_write_swig_interface_file): For Python3, include an encoding argument to

tempfile.TemporaryFile()

* build/generator/util/executable.py

(output): Ensure the subprocess' output is interpreted as utf8 for proper

Python 3 compatibility.

[in subversion/bindings/swig/python]

* svn/core.py

Import the builtin 'list' as '_bi_list' to aid in compatibility in other

modules.

(_unprefix_names): Wrap dict.items() in list() for py2.7/3 support.

(__all__): Change filter() to list comprehension for py2.7/3 support.

* svn/client.py

svn/delta.py

svn/diff.py

svn/fs.py

svn/ra.py

svn/repos.py

svn/wc.py

(__all__): Change filter() to list comprehension for py2.7/3 support. Use the

_bi_list to provide a new list instance of locals on both Python 2.7 and 3.

* svn/fs.py

(entries): Wrap dict.items() in _bi_list() for py2.7/3 support.

* tests/auth.py

(test_open): Change deprecated assert_ to assertTrue.

(test_credentials_get_username,

test_credentials_get_simple,

test_credentials_get_ssl_client_cert,

test_credentials_get_ssl_client_cert_pw,

test_credentials_get_ssl_server_trust):

Change deprecated assertEquals to assertEqual and assert_ to assertTrue.

* tests/client.py

(setUp, test_log5, proplist_receiver_trunk, proplist_receiver_dir1,

test_inherited_props, test_update4):

Change deprecated assertEquals to assertEqual.

(testBatonPlay): Change deprecated assertEquals to assertEqual and

assertNotEquals to assertNotEqual.

(test_log3_url, test_platform_providers):

Change deprecated assert_ to assertTrue.

(test_log5): Change deprecated assert_ to assertTrue and assertEquals to

assertEqual.

* tests/core.py

(test_config_enumerate2): Replace dict.iteritems() with dict.items() to be

compatible with py2.7/3. Change deprecated assert_ to assertTrue.

(test_config_enumerate_sections2): Change deprecated assert_ to assertTrue.

* tests/delta.py

(testTxdeltaWindowT): Change deprecated assert_ to assertTrue.

* tests/mergeinfo.py

(test_rangelist_reverse,

test_mergeinfo_leakage__incorrect_range_t_refcounts,

test_mergeinfo_leakage__lingering_range_t_objects_after_del,

inspect_mergeinfo_dict):

Change deprecated assertEquals to assertEqual.

(test_mergeinfo_leakage__incorrect_range_t_refcounts): Wrap dict.items() in

list() for py2.7/3 support. Change deprecated assertEquals to assertEqual.

(inspect_mergeinfo_dict): Change deprecated assert_ to assertTrue.

(compare_mergeinfo_catalogs,

compare_mergeinfos):

Drop usage of dict.keys() for py2.7/3 support.

* tests/ra.py

(test_get_dir2, test_delta_driver_commit, test_get_file_revs,

test_lock, test_get_log2, test_namestring):

Change deprecated assert_ to assertTrue.

(test_delta_driver_commit): Wrap dict.items() in list() for py2.7/3 support.

* tests/repository.py

(test_dump_fs2): Change deprecated assertEquals to assertEqual.

(test_get_logs): Wrap dict.values() in list() for py2.7/3 support.

* tests/run_all.py

(suite): Do not use long() cast when running with Python 3.

* tests/utils.py

Support correct import of StringIO and pathname2url from Python 2.7 and 3.

(file_uri_for_path): Use unqualified pathname2url to support py2.7/3.

* tests/wc.py

(test_is_adm_dir, test_set_adm_dir, test_status_editor,

test_is_normal_prop, test_is_wc_prop, test_is_entry_prop):

Change deprecated assert_ to assertTrue and failIf to assertFalse.

(test_get_adm_dir, test_crawl_revisions2, test_check_wc, test_get_prop_diffs,

test_get_ignores):

Change deprecated assert_ with assertTrue.

(test_commit): Change deprecated assertEquals to assertEqual.

(test_diff_editor4): Wrap dict.items() in list() for py2.7/3 support.

* tests/trac/versioncontrol/svn_fs.py

(get_entries): Drop usage of dict.keys() for py2.7/3 support.

(get_properties, get_changes): Wrap dict.items() with list() for py2.7/3

support.

* tests/trac/versioncontrol/tests/svn_fs.py

Support correct import of StringIO and pathname2url from Python 2.7 and 3.

(test_get_dir_entries, test_get_file_entries, test_get_node_history,

test_get_node_history_follow_copy, test_get_path_history,

test_get_path_history_copied_file, test_get_path_history_copied_dir,

test_changeset_added_dirs, test_changeset_file_edit, test_changset_dir_moves,

test_changeset_file_copy):

Replace the series of direct calls to .next() with assertSequenceEqual for

py2.7/3 support.

(test_diff_file_different_revs, test_diff_file_different_files,

test_diff_file_no_change, test_diff_dir_different_revs,

test_diff_dir_different_dirs, test_diff_dir_no_change,

test_changeset_repos_creation):

Replace <iter>.next() with next(<iter>) for py2.7/3 support.

  1. … 21 more files in changeset.