Merge lp:~luoyonggang/subvertpy/python3 into lp:~jelmer/subvertpy/trunk

[Yonggang Luo]

Test result on windows:

D:\CI\bld\vcs\subvertpy-python3>python setup.py test
running test
running build
running build_py
copying subvertpy\tests\test_ra.py -> build\lib.win32-3.2\subvertpy\tests
running build_ext
running build_scripts
Running unittest without install.
.E..................................................................................................................................................F.
.E....................
======================================================================
ERROR: test_add_recursive (subvertpy.tests.test_client.TestClient)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "build\lib.win32-3.2\subvertpy\tests\test_client.py", line 100, in test_add_recursive
    e = adm.entry(os.path.join(os.getcwd(), "dc", "trunk"))
KeyError: "No such entry 'C:\\Users\\dreamkxd\\AppData\\Local\\Temp\\tmpdx4j5t\\dc\\trunk'"

======================================================================
ERROR: test_probe_try (subvertpy.tests.test_wc.AdmTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "build\lib.win32-3.2\subvertpy\tests\test_wc.py", line 301, in test_probe_try
    self.assertEqual("checkout", adm.probe_try(os.path.join("checkout", "bar")).access_path())
AttributeError: 'NoneType' object has no attribute 'access_path'

======================================================================
FAIL: test_is_wc_root (subvertpy.tests.test_wc.AdmTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "build\lib.win32-3.2\subvertpy\tests\test_wc.py", line 226, in test_is_wc_root
    self.assertFalse(adm.is_wc_root(os.path.join(self.test_dir, "bar")))
AssertionError: True is not false

----------------------------------------------------------------------
Ran 172 tests in 61.694s

FAILED (failures=1, errors=2)

D:\CI\bld\vcs\subvertpy-python3>

[Jelmer Vernooij (jelmer)]

THis has a lot of conflicts.

review: Needs Fixing

[Yonggang Luo (luoyonggang)]

This is not ready for merge, I am request for *TEST *it:)...
Anyway, it's passed all tests except *three *test failed under Python 2.7

2012/3/11 Jelmer Vernooij <email address hidden>

> Review: Needs Fixing
>
> THis has a lot of conflicts.
> --
> https://code.launchpad.net/~luoyonggang/subvertpy/python3/+merge/96917
> You are the owner of lp:~luoyonggang/subvertpy/python3.
>

--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[Jelmer Vernooij (jelmer)]

> This is not ready for merge, I am request for *TEST *it:)...
> Anyway, it's passed all tests except *three *test failed under Python 2.7
I'm not sure I follow? Merge requests are meant to be used to request a branch to be merged into another.

If you're trying to do something else with them, please at least *mention* what that is.

Jelmer
>
> 2012/3/11 Jelmer Vernooij <email address hidden>
>
> > Review: Needs Fixing
> >
> > THis has a lot of conflicts.
> > --
> > https://code.launchpad.net/~luoyonggang/subvertpy/python3/+merge/96917
> > You are the owner of lp:~luoyonggang/subvertpy/python3.
> >
>
>
>
> --
> 此致
> 礼
> 罗勇刚
> Yours
> sincerely,
> Yonggang Luo

[Yonggang Luo (luoyonggang)]

2012/3/11 Jelmer Vernooij <email address hidden>

> > This is not ready for merge, I am request for *TEST *it:)...
> > Anyway, it's passed all tests except *three *test failed under Python 2.7
> I'm not sure I follow? Merge requests are meant to be used to request a
> branch to be merged into another.
>
> If you're trying to do something else with them, please at least *mention*
> what that is.
>
OK... well, I want to know is there any problem with unittest merge
request? I've got no response..
Or you have other ways to deal with package_data?

>
> Jelmer
> >
> > 2012/3/11 Jelmer Vernooij <email address hidden>
> >
> > > Review: Needs Fixing
> > >
> > > THis has a lot of conflicts.
> > > --
> > > https://code.launchpad.net/~luoyonggang/subvertpy/python3/+merge/96917
> > > You are the owner of lp:~luoyonggang/subvertpy/python3.
> > >
> >
> >
> >
> > --
> > 此致
> > 礼
> > 罗勇刚
> > Yours
> > sincerely,
> > Yonggang Luo
> --
> https://code.launchpad.net/~luoyonggang/subvertpy/python3/+merge/96917
> You are the owner of lp:~luoyonggang/subvertpy/python3.
>

--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[Jelmer Vernooij (jelmer)]

> 2012/3/11 Jelmer Vernooij <email address hidden>
>
> > > This is not ready for merge, I am request for *TEST *it:)...
> > > Anyway, it's passed all tests except *three *test failed under Python 2.7
> > I'm not sure I follow? Merge requests are meant to be used to request a
> > branch to be merged into another.
> >
> > If you're trying to do something else with them, please at least *mention*
> > what that is.
> >
> OK... well, I want to know is there any problem with unittest merge
> request? I've got no response..
What is a unittest merge request?

> Or you have other ways to deal with package_data?
I don't see how that's relevant in the python3 branch..

Cheers,

Jelmer

[Yonggang Luo (luoyonggang)]

2012/3/11 Jelmer Vernooij <email address hidden>

> > 2012/3/11 Jelmer Vernooij <email address hidden>
> >
> > > > This is not ready for merge, I am request for *TEST *it:)...
> > > > Anyway, it's passed all tests except *three *test failed under
> Python 2.7
> > > I'm not sure I follow? Merge requests are meant to be used to request a
> > > branch to be merged into another.
> > >
> > > If you're trying to do something else with them, please at least
> *mention*
> > > what that is.
> > >
> > OK... well, I want to know is there any problem with unittest merge
> > request? I've got no response..
> What is a unittest merge request?
>
> > Or you have other ways to deal with package_data?
> I don't see how that's relevant in the python3 branch..
>
Python 3 is also contained this patch...
merge that first will get this branch be easier to merge.

>
> Cheers,
>
> Jelmer
> --
> https://code.launchpad.net/~luoyonggang/subvertpy/python3/+merge/96917
> You are the owner of lp:~luoyonggang/subvertpy/python3.
>

--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

[lp:~luoyonggang/subvertpy/python3]

2470. By Yonggang Luo on 2012-03-12

Merge mainline again.

2471. By Yonggang Luo on 2012-03-13

Merge mainline

2472. By Yonggang Luo on 2012-03-28

can pass custom test now.

2473. By Yonggang Luo on 2012-03-28

Get unit test to be passed.

2474. By Yonggang Luo on 2012-03-28

Remove unecessary file close.

2475. By Yonggang Luo on 2012-03-28

Remove unecessary file seek.

2476. By Yonggang Luo on 2012-03-28

.....More readable.

2477. By Yonggang Luo on 2012-03-28

Use addCleanup instead directly close.

2478. By Yonggang Luo on 2012-03-29

enhance PyOS_tmpfile.

2479. By Yonggang Luo on 2012-04-06

simplify the logic of py_open_tmp_file by using of
enhanced apr_file_t *apr_file_from_object(PyObject *object, apr_pool_t *pool)

2480. By Yonggang Luo on 2012-04-06

Remove trailling space.

2481. By Yonggang Luo on 2012-04-06

merge duplicated code.

2482. By Yonggang Luo on 2012-04-06

comment update.

2483. By Yonggang Luo on 2012-04-06

Directly copy the binary files to build directory.

2484. By Yonggang Luo on 2012-04-06

more comments.

2485. By Yonggang Luo on 2012-04-06

Use svn_dirent_internal_style and svn_dirent_local_style instead svn_path_canonicalize, because under win32
the svn internal path is differ win32 local path,
such as C:\Path\To\Repos,
the win32 local path representation is C:\Path\To\Repos
but the svn internal path representation is C:/Path/To/Repos, so we need
use svn_dirent_internal_style and svn_dirent_local_style

2486. By Yonggang Luo on 2012-04-06

before svn 1.6, there is no svn_dirent_internal_style and svn_dirent_local_style

2487. By Yonggang Luo on 2012-04-06

Py_DECREF ret

2488. By Yonggang Luo on 2012-04-06

use svn_dirent_internal_style and svn_dirent_local_style

2489. By Yonggang Luo on 2012-04-07

set sys.path in the right way.

Unmerged revisions

2489. By Yonggang Luo on 2012-04-07

set sys.path in the right way.

2488. By Yonggang Luo on 2012-04-06

use svn_dirent_internal_style and svn_dirent_local_style

2487. By Yonggang Luo on 2012-04-06

Py_DECREF ret

2486. By Yonggang Luo on 2012-04-06

before svn 1.6, there is no svn_dirent_internal_style and svn_dirent_local_style

2485. By Yonggang Luo on 2012-04-06

Use svn_dirent_internal_style and svn_dirent_local_style instead svn_path_canonicalize, because under win32
the svn internal path is differ win32 local path,
such as C:\Path\To\Repos,
the win32 local path representation is C:\Path\To\Repos
but the svn internal path representation is C:/Path/To/Repos, so we need
use svn_dirent_internal_style and svn_dirent_local_style

2484. By Yonggang Luo on 2012-04-06

more comments.

2483. By Yonggang Luo on 2012-04-06

Directly copy the binary files to build directory.

2482. By Yonggang Luo on 2012-04-06

comment update.

2481. By Yonggang Luo on 2012-04-06

merge duplicated code.

2480. By Yonggang Luo on 2012-04-06

Remove trailling space.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-01 12:08:06 +0000
+++ .bzrignore	2012-04-07 06:08:21 +0000
@@ -7,3 +7,5 @@
 .testrepository
 .noseids
 apidocs
+*.dll
+.*project

=== modified file 'Makefile'
--- Makefile	2011-12-13 18:49:14 +0000
+++ Makefile	2012-04-07 06:08:21 +0000
@@ -1,13 +1,7 @@
 PYTHON = python
 PYDOCTOR = pydoctor
 SETUP = $(PYTHON) setup.py
-ifeq ($(shell $(PYTHON) -c "import sys; print sys.version_info >= (2, 7)"),True)
-TESTRUNNER = unittest
-else
-TESTRUNNER = unittest2.__main__
-endif
 DEBUGGER ?=
-RUNTEST = PYTHONPATH=.:$(PYTHONPATH) $(DEBUGGER) $(PYTHON) -m $(TESTRUNNER)
 
 all: build build-inplace
 
@@ -20,8 +14,8 @@
 install::
 	$(SETUP) install
 
-check:: build-inplace
-	$(RUNTEST) $(TEST_OPTIONS) subvertpy.tests.test_suite
+check::
+	$(SETUP) test $(TEST_OPTIONS)
 
 gdb-check::
 	$(MAKE) check DEBUGGER="gdb --args"
@@ -31,7 +25,7 @@
 
 clean::
 	$(SETUP) clean
-	rm -f subvertpy/*.so subvertpy/*.o subvertpy/*.pyc
+	rm -f subvertpy/*.so subvertpy/*.o subvertpy/*.pyc subvertpy/*.dll
 
 pydoctor:
 	$(PYDOCTOR) --introspect-c-modules -c subvertpy.cfg --make-html

=== modified file 'bin/subvertpy-fast-export'
--- bin/subvertpy-fast-export	2010-12-11 23:22:11 +0000
+++ bin/subvertpy-fast-export	2012-04-07 06:08:21 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 # svn-fast-export.py
 # ----------

=== modified file 'examples/ra_commit.py'
--- examples/ra_commit.py	2009-08-04 12:25:53 +0000
+++ examples/ra_commit.py	2012-04-07 06:08:21 +0000
@@ -2,7 +2,7 @@
 # Demonstrates how to do a new commit using Subvertpy
 
 import os
-from cStringIO import StringIO
+from io import StringIO
 from subvertpy import delta, repos
 from subvertpy.ra import RemoteAccess, Auth, get_username_provider
 

=== modified file 'examples/ra_log.py'
--- examples/ra_log.py	2010-07-25 22:40:00 +0000
+++ examples/ra_log.py	2012-04-07 06:08:21 +0000
@@ -7,14 +7,14 @@
 
 for (changed_paths, rev, revprops, has_children) in conn.iter_log(paths=None,
         start=0, end=conn.get_latest_revnum(), discover_changed_paths=True):
-    print "=" * 79
-    print "%d:" % rev
-    print "Revision properties:"
-    for entry in revprops.items(): 
-        print "  %s: %s" % entry
-    print ""
+    print("=" * 79)
+    print("%d:" % rev)
+    print("Revision properties:")
+    for entry in list(revprops.items()): 
+        print("  %s: %s" % entry)
+    print("")
 
-    print "Changed paths"
-    for path, (action, from_path, from_rev) in changed_paths.iteritems():
-        print "  %s (%s)" % (path, action)
+    print("Changed paths")
+    for path, (action, from_path, from_rev) in changed_paths.items():
+        print("  %s (%s)" % (path, action))
 

=== modified file 'examples/ra_replay.py'
--- examples/ra_replay.py	2009-04-04 14:39:10 +0000
+++ examples/ra_replay.py	2012-04-07 06:08:21 +0000
@@ -10,7 +10,7 @@
 class MyFileEditor:
     
     def change_prop(self, key, value):
-        print "Change prop: %s -> %r" % (key, value)
+        print("Change prop: %s -> %r" % (key, value))
 
     def apply_textdelta(self, base_checksum):
         # This should return a function that can receive delta windows
@@ -24,26 +24,26 @@
 class MyDirEditor:
 
     def open_directory(self, *args):
-        print "Open dir: %s (base revnum: %r)" % args
+        print("Open dir: %s (base revnum: %r)" % args)
         return MyDirEditor()
 
     def add_directory(self, path, copyfrom_path=None, copyfrom_rev=-1):
-        print "Add dir: %s (from %r:%r)" % (path, copyfrom_path, copyfrom_rev)
+        print("Add dir: %s (from %r:%r)" % (path, copyfrom_path, copyfrom_rev))
         return MyDirEditor()
 
     def open_file(self, *args):
-        print "Open file: %s (base revnum: %r)" % args
+        print("Open file: %s (base revnum: %r)" % args)
         return MyFileEditor()
 
     def add_file(self, path, copyfrom_path=None, copyfrom_rev=-1):
-        print "Add file: %s (from %r:%r)" % (path, copyfrom_path, copyfrom_rev)
+        print("Add file: %s (from %r:%r)" % (path, copyfrom_path, copyfrom_rev))
         return MyFileEditor()
 
     def change_prop(self, key, value):
-        print "Change prop %s -> %r" % (key, value)
+        print("Change prop %s -> %r" % (key, value))
 
     def delete_entry(self, path, revision):
-        print "Delete: %s" % path
+        print("Delete: %s" % path)
 
     def close(self):
         pass
@@ -52,16 +52,16 @@
 class MyEditor:
 
     def set_target_revision(self, revnum):
-        print "Target revision: %d" % revnum
+        print("Target revision: %d" % revnum)
 
     def abort(self):
-        print "Aborted"
+        print("Aborted")
 
     def close(self):
-        print "Closed"
+        print("Closed")
 
     def open_root(self, base_revnum):
-        print "/"
+        print("/")
         return MyDirEditor()
 
 

=== modified file 'examples/ra_shell.py'
--- examples/ra_shell.py	2009-05-21 13:13:07 +0000
+++ examples/ra_shell.py	2012-04-07 06:08:21 +0000
@@ -6,23 +6,23 @@
 import sys
 
 if len(sys.argv) == 1:
-    print "Usage: %s <url>" % sys.argv
+    print("Usage: %s <url>" % sys.argv)
 
 url = sys.argv[1]
 
 conn = RemoteAccess(url)
 
 def log_printer(changed_paths, rev, revprops, has_children=None):
-    print "=" * 79
-    print "%d:" % rev
-    print "Revision properties:"
-    for entry in revprops.items(): 
-        print "  %s: %s" % entry
-    print ""
+    print("=" * 79)
+    print("%d:" % rev)
+    print("Revision properties:")
+    for entry in list(revprops.items()): 
+        print("  %s: %s" % entry)
+    print("")
     
-    print "Changed paths:"
-    for path, (action, from_path, from_rev) in changed_paths.iteritems():
-        print "  %s (%s)" % (path, action)
+    print("Changed paths:")
+    for path, (action, from_path, from_rev) in changed_paths.items():
+        print("  %s (%s)" % (path, action))
 
 
 class RaCmd(cmd.Cmd):
@@ -42,17 +42,17 @@
     def do_help(self, args):
         for name in sorted(self.__class__.__dict__):
             if name.startswith("do_"):
-                print name[3:]
+                print(name[3:])
 
     def do_stat(self, args):
         path, revnum = self.parse_path_revnum(args)
-        print conn.stat(path, revnum)
+        print(conn.stat(path, revnum))
 
     def do_ls(self, args):
         path, revnum = self.parse_path_revnum(args)
         (dirents, fetched_rev, props) = conn.get_dir(path, revnum)
         for name in dirents:
-            print name
+            print(name)
 
     def do_cat(self, args):
         path, revnum = self.parse_path_revnum(args)
@@ -66,27 +66,27 @@
         conn.change_rev_prop(int(revnum), name, value)
 
     def do_has_capability(self, args):
-        print conn.has_capability(args)
+        print(conn.has_capability(args))
 
     def do_revprops(self, args):
-        for item in conn.rev_proplist(int(args)).iteritems():
-            print "%s: %s" % item
+        for item in conn.rev_proplist(int(args)).items():
+            print("%s: %s" % item)
 
     def do_check_path(self, args):
         path, revnum = self.parse_path_revnum(args)
         kind = conn.check_path(path, revnum)
         if kind == subvertpy.NODE_DIR:
-            print "dir"
+            print("dir")
         elif kind == subvertpy.NODE_FILE:
-            print "file"
+            print("file")
         else:
-            print "nonexistant"
+            print("nonexistant")
 
     def do_uuid(self, args):
-        print conn.get_uuid()
+        print(conn.get_uuid())
 
     def do_get_repos_root(self, args):
-        print conn.get_repos_root()
+        print(conn.get_repos_root())
 
     def do_log(self, args):
         conn.get_log(callback=log_printer, paths=None, start=0, 

=== modified file 'setup.py'
--- setup.py	2012-03-04 16:58:04 +0000
+++ setup.py	2012-04-07 06:08:21 +0000
@@ -2,9 +2,9 @@
 # Setup file for subvertpy
 # Copyright (C) 2005-2010 Jelmer Vernooij <[e-mail]>
 
-from distutils.core import setup
+from distutils.core import setup, Command
 from distutils.extension import Extension
-from distutils.command.install_lib import install_lib
+from distutils.command.build import build
 from distutils import log
 import sys
 import os
@@ -277,11 +277,45 @@
         Extension.__init__(self, name, *args, **kwargs)
 
 
-# On Windows, we install the apr binaries too.
-class install_lib_with_dlls(install_lib):
+class TestCommand(Command):
+    """Command for running unittests without install."""
+
+    user_options = [("args=", None, '''The command args string passed to
+                                    unittest framework, such as 
+                                     --args="-v -f"''')]
+
+    def initialize_options(self):
+        self.args = ''
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        self.run_command('build')
+        bld = self.distribution.get_command_obj('build')
+        #Add build_lib in to sys.path so that unittest can found DLLs and libs
+        sys.path = [os.path.abspath(bld.build_lib)] + sys.path
+        os.chdir(bld.build_lib)
+        log.info("Running unittest without install.")
+
+        import shlex
+        import unittest
+        test_argv0 = [sys.argv[0] + ' test --args=']
+        #For transfering args to unittest, we have to split args
+        #by ourself, so that command like:
+        #python setup.py test --args="-v -f"
+        #can be executed, and the parameter '-v -f' can be
+        #transfering to unittest properly.
+        test_argv = test_argv0 + shlex.split(self.args)
+        unittest.main(module=None, defaultTest='subvertpy.tests.test_suite', argv=test_argv)
+
+
+class BuildWithDLLs(build):
     def _get_dlls(self):
         # return a list of of (FQ-in-name, relative-out-name) tuples.
         ret = []
+        # the apr binaries.
         apr_bins = [libname + ".dll" for libname in extra_libs
                     if libname.startswith("libapr")]
         if get_svn_version() >= (1,5,0):
@@ -297,11 +331,11 @@
         look_dirs = os.environ.get("PATH","").split(os.pathsep)
         look_dirs.insert(0, os.path.join(os.environ["SVN_DEV"], "bin"))
 
+        target = os.path.abspath(os.path.join(self.build_lib, 'subvertpy'))
         for bin in apr_bins:
             for look in look_dirs:
                 f = os.path.join(look, bin)
                 if os.path.isfile(f):
-                    target = os.path.join(self.install_dir, "subvertpy", bin)
                     ret.append((f, target))
                     break
             else:
@@ -310,20 +344,21 @@
         return ret
 
     def run(self):
-        install_lib.run(self)
+        build.run(self)
         # the apr binaries.
         # On Windows we package up the apr dlls with the plugin.
         for s, d in self._get_dlls():
             self.copy_file(s, d)
 
     def get_outputs(self):
-        ret = install_lib.get_outputs(self)
+        ret = build.get_outputs(self)
         ret.extend([info[1] for info in self._get_dlls()])
         return ret
 
-cmdclass = {}
+cmdclass = {'test': TestCommand}
 if os.name == 'nt':
-    cmdclass['install_lib'] = install_lib_with_dlls
+    # BuildWithDLLs can copy external DLLs into source directory.
+    cmdclass['build'] = BuildWithDLLs
 
 def source_path(filename):
     return os.path.join("subvertpy", filename)

=== modified file 'subvertpy/__init__.py'
--- subvertpy/__init__.py	2012-03-26 09:44:03 +0000
+++ subvertpy/__init__.py	2012-04-07 06:08:21 +0000
@@ -121,13 +121,13 @@
     return True
 
 try:
-    import client, _ra, repos, wc
+    from . import client, _ra, repos, wc
     for x in client, _ra, repos, wc:
         if not _check_mtime(x):
             from warnings import warn
             warn("subvertpy extensions are outdated and need to be rebuilt")
             break
-except ImportError, e:
+except ImportError as e:
     raise ImportError("Unable to load subvertpy extensions: %s" % e)
 
 

=== modified file 'subvertpy/_ra.c'
--- subvertpy/_ra.c	2012-02-24 06:40:23 +0000
+++ subvertpy/_ra.c	2012-04-07 06:08:21 +0000
@@ -28,8 +28,8 @@
 
 #include <structmember.h>
 
+#include "util.h"
 #include "editor.h"
-#include "util.h"
 #include "ra.h"
 
 #if ONLY_SINCE_SVN(1, 5)
@@ -40,11 +40,11 @@
 
 static PyObject *busy_exc;
 
-staticforward PyTypeObject Reporter_Type;
-staticforward PyTypeObject RemoteAccess_Type;
-staticforward PyTypeObject AuthProvider_Type;
-staticforward PyTypeObject CredentialsIter_Type;
-staticforward PyTypeObject Auth_Type;
+static PyTypeObject Reporter_Type;
+static PyTypeObject RemoteAccess_Type;
+static PyTypeObject AuthProvider_Type;
+static PyTypeObject CredentialsIter_Type;
+static PyTypeObject Auth_Type;
 
 static bool ra_check_svn_path(char *path)
 {
@@ -294,7 +294,7 @@
 }
 
 static PyTypeObject Reporter_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.Reporter", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(ReporterObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -481,7 +481,7 @@
 
 	CB_CHECK_PYRETVAL(ret);
 
-	*name = apr_pstrdup(pool, PyString_AsString(ret));
+	*name = apr_pstrdup(pool, _PyUnicode_AsString(ret));
 	Py_DECREF(ret);
 
 	PyGILState_Release(state);
@@ -495,7 +495,6 @@
 {
 	RemoteAccessObject *self = (RemoteAccessObject *)callback;
 	PyObject *ret;
-	apr_status_t status;
 	PyGILState_STATE state;
 
 	if (self->open_tmp_file_func == Py_None) {
@@ -518,32 +517,12 @@
 
 	CB_CHECK_PYRETVAL(ret);
 
-	if (PyString_Check(ret)) {
-		char* fname = PyString_AsString(ret);
-		status = apr_file_open(fp, fname, APR_CREATE | APR_READ | APR_WRITE, APR_OS_DEFAULT, 
-								pool);
-		if (status) {
-			PyErr_SetAprStatus(status);
-			Py_DECREF(ret);
-			PyGILState_Release(state);
-			return py_svn_error();
-		}
-		Py_DECREF(ret);
-	} else if (PyFile_Check(ret)) {
-		*fp = apr_file_from_object(ret, pool);
-		Py_DECREF(ret);
-		if (!*fp) {
-			PyGILState_Release(state);
-			return py_svn_error();
-		}
-	} else {
-		PyErr_SetString(PyExc_TypeError, "Unknown type for file variable");
-		Py_DECREF(ret);
-		PyGILState_Release(state);
+	*fp = apr_file_from_object(ret, pool);
+	Py_DECREF(ret);
+	PyGILState_Release(state);
+	if (!*fp) {
 		return py_svn_error();
 	}
-
-	PyGILState_Release(state);
 	return NULL;
 }
 
@@ -576,7 +555,7 @@
 	svn_error_t *err;
 
 	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "s|OOOOOz", kwnames, &url, 
-									 &progress_cb, (PyObject **)&auth, &config, 
+									 &progress_cb, (PyObject **)&auth, &config,
 									 &client_string_func, &open_tmp_file_func, 
 									 &uuid))
 		return NULL;
@@ -683,7 +662,7 @@
 #else
 	RUN_RA_WITH_POOL(temp_pool, ra, svn_ra_get_uuid(ra->ra, &uuid, temp_pool));
 #endif
-	ret = PyString_FromString(uuid);
+	ret = PyUnicode_FromString(uuid);
 	apr_pool_destroy(temp_pool);
 	return ret;
 }
@@ -728,7 +707,7 @@
 	RUN_RA_WITH_POOL(temp_pool, ra,
 				  svn_ra_get_latest_revnum(ra->ra, &latest_revnum, temp_pool));
 	apr_pool_destroy(temp_pool);
-	return PyInt_FromLong(latest_revnum);
+	return PyLong_FromLong(latest_revnum);
 }
 
 static PyObject *ra_get_log(PyObject *self, PyObject *args, PyObject *kwargs)
@@ -780,7 +759,7 @@
 	} else {
 		int i;
 		for (i = 0; i < PySequence_Size(revprops); i++) {
-			const char *n = PyString_AsString(PySequence_GetItem(revprops, i));
+			const char *n = _PyUnicode_AsString(PySequence_GetItem(revprops, i));
 			if (strcmp(SVN_PROP_REVISION_LOG, n) && 
 				strcmp(SVN_PROP_REVISION_AUTHOR, n) &&
 				strcmp(SVN_PROP_REVISION_DATE, n)) {
@@ -850,7 +829,7 @@
 		apr_pool_destroy(temp_pool);
 	}
 
-	return PyString_FromString(ra->root);
+	return PyUnicode_FromString(ra->root);
 }
 
 /**
@@ -872,7 +851,7 @@
 	RUN_RA_WITH_POOL(temp_pool, ra,
 						svn_ra_get_session_url(ra->ra, &url, temp_pool));
 
-	r = PyString_FromString(url);
+	r = PyUnicode_FromString(url);
 
 	apr_pool_destroy(temp_pool);
 
@@ -1248,8 +1227,8 @@
 		PyObject *k, *v;
 		hash_lock_tokens = apr_hash_make(pool);
 		while (PyDict_Next(lock_tokens, &idx, &k, &v)) {
-			apr_hash_set(hash_lock_tokens, PyString_AsString(k), 
-						 PyString_Size(k), PyString_AsString(v));
+			apr_hash_set(hash_lock_tokens, _PyUnicode_AsString(k), 
+						 PyUnicode_GetSize(k), _PyUnicode_AsString(v));
 		}
 	}
 
@@ -1296,7 +1275,7 @@
 		return NULL;
 	}
 
-	if (!PyString_Check(py_log_msg)) {
+	if (!PyUnicode_Check(py_log_msg)) {
 		PyErr_SetString(PyExc_ValueError, "svn:log property should be set to string.");
 		apr_pool_destroy(pool);
 		Py_DECREF(commit_callback);
@@ -1307,7 +1286,7 @@
 	Py_BEGIN_ALLOW_THREADS
 	err = svn_ra_get_commit_editor2(ra->ra, &editor, 
 		&edit_baton, 
-		PyString_AsString(py_log_msg), py_commit_callback, 
+		_PyUnicode_AsString(py_log_msg), py_commit_callback, 
 		commit_callback, hash_lock_tokens, keep_locks, pool);
 #endif
 	Py_END_ALLOW_THREADS
@@ -1414,7 +1393,7 @@
 				pykey = Py_None;
 				Py_INCREF(pykey);
 			} else {
-				pykey = PyString_FromString((char *)key);
+				pykey = PyUnicode_FromString((char *)key);
 			}
 			if (PyDict_SetItem(py_dirents, pykey, item) != 0) {
 				Py_DECREF(py_dirents);
@@ -1525,7 +1504,7 @@
 					  svn_ra_check_path(ra->ra, svn_path_canonicalize(path, temp_pool), revision, &kind, 
 					 temp_pool));
 	apr_pool_destroy(temp_pool);
-	return PyInt_FromLong(kind);
+	return PyLong_FromLong(kind);
 }
 
 static PyObject *ra_stat(PyObject *self, PyObject *args)
@@ -1603,7 +1582,7 @@
 		return NULL;
 	hash_path_tokens = apr_hash_make(temp_pool);
 	while (PyDict_Next(path_tokens, &idx, &k, &v)) {
-		apr_hash_set(hash_path_tokens, PyString_AsString(k), PyString_Size(k), (char *)PyString_AsString(v));
+		apr_hash_set(hash_path_tokens, _PyUnicode_AsString(k), PyUnicode_GetSize(k), (char *)_PyUnicode_AsString(v));
 	}
 	RUN_RA_WITH_POOL(temp_pool, ra, svn_ra_unlock(ra->ra, hash_path_tokens, break_lock,
 					 py_lock_func, lock_func, temp_pool));
@@ -1642,12 +1621,12 @@
 
 	while (PyDict_Next(path_revs, &idx, &k, &v)) {
 		rev = (svn_revnum_t *)apr_palloc(temp_pool, sizeof(svn_revnum_t));
-		*rev = PyInt_AsLong(v);
+		*rev = PyLong_AsLong(v);
 		if (*rev == -1 && PyErr_Occurred()) {
 			apr_pool_destroy(temp_pool);
 			return NULL;
 		}
-		apr_hash_set(hash_path_revs, PyString_AsString(k), PyString_Size(k), 
+		apr_hash_set(hash_path_revs, _PyUnicode_AsString(k), PyUnicode_GetSize(k), 
 					 rev);
 	}
 	RUN_RA_WITH_POOL(temp_pool, ra, svn_ra_lock(ra->ra, hash_path_revs, comment, steal_lock,
@@ -1751,7 +1730,7 @@
 	for (idx = apr_hash_first(temp_pool, hash_locations); idx != NULL;
 		idx = apr_hash_next(idx)) {
 		apr_hash_this(idx, (const void **)&key, &klen, (void **)&val);
-		if (PyDict_SetItem(ret, PyInt_FromLong(*key), PyString_FromString(val)) != 0) {
+		if (PyDict_SetItem(ret, PyLong_FromLong(*key), PyUnicode_FromString(val)) != 0) {
 			Py_DECREF(ret);
 			apr_pool_destroy(temp_pool);
 			return NULL;
@@ -2003,7 +1982,7 @@
 static PyObject *ra_repr(PyObject *self)
 {
 	RemoteAccessObject *ra = (RemoteAccessObject *)self;
-	return PyString_FromFormat("RemoteAccess(\"%s\")", ra->url);
+	return PyUnicode_FromFormat("RemoteAccess(\"%s\")", ra->url);
 }
 
 static int ra_set_progress_func(PyObject *self, PyObject *value, void *closure)
@@ -2117,7 +2096,7 @@
 };
 
 static PyTypeObject RemoteAccess_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.RemoteAccess", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(RemoteAccessObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2204,7 +2183,7 @@
 }
 
 static PyTypeObject AuthProvider_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.AuthProvider", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(AuthProviderObject),
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2281,14 +2260,14 @@
 		return NULL;
 
 	if (!strcmp(name, SVN_AUTH_PARAM_SSL_SERVER_FAILURES)) {
-		long ret = PyInt_AsLong(value);
+		long ret = PyLong_AsLong(value);
 		if (ret == -1 && PyErr_Occurred())
 			return NULL;
 		vvalue = apr_pcalloc(auth->pool, sizeof(apr_uint32_t));
 		*((apr_uint32_t *)vvalue) = ret;
 	} else if (!strcmp(name, SVN_AUTH_PARAM_DEFAULT_USERNAME) ||
 			   !strcmp(name, SVN_AUTH_PARAM_DEFAULT_PASSWORD)) {
-		vvalue = apr_pstrdup(auth->pool, PyString_AsString(value));
+		vvalue = apr_pstrdup(auth->pool, _PyUnicode_AsString(value));
 	} else {
 		PyErr_Format(PyExc_TypeError, "Unsupported auth parameter %s", name);
 		return NULL;
@@ -2311,10 +2290,10 @@
 	value = svn_auth_get_parameter(auth->auth_baton, name);
 
 	if (!strcmp(name, SVN_AUTH_PARAM_SSL_SERVER_FAILURES)) {
-		return PyInt_FromLong(*((apr_uint32_t *)value));
+		return PyLong_FromLong(*((apr_uint32_t *)value));
 	} else if (!strcmp(name, SVN_AUTH_PARAM_DEFAULT_USERNAME) ||
 			   !strcmp(name, SVN_AUTH_PARAM_DEFAULT_PASSWORD)) {
-		return PyString_FromString((const char *)value);
+		return PyUnicode_FromString((const char *)value);
 	} else {
 		PyErr_Format(PyExc_TypeError, "Unsupported auth parameter %s", name);
 		return NULL;
@@ -2404,7 +2383,7 @@
 }
 
 static PyTypeObject CredentialsIter_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.CredentialsIter", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(CredentialsIterObject),
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2482,7 +2461,7 @@
 }
 
 static PyTypeObject Auth_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.Auth", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(AuthObject),
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2586,14 +2565,14 @@
 	}
 	py_username = PyTuple_GetItem(ret, 0);
 	CB_CHECK_PYRETVAL(py_username);
-	if (!PyString_Check(py_username)) {
+	if (!PyUnicode_Check(py_username)) {
 		PyErr_SetString(PyExc_TypeError, "username should be string");
 		PyGILState_Release(state);
 		return py_svn_error();
 	}
 
 	*cred = apr_pcalloc(pool, sizeof(**cred));
-	(*cred)->username = apr_pstrdup(pool, PyString_AsString(py_username));
+	(*cred)->username = apr_pstrdup(pool, _PyUnicode_AsString(py_username));
 	(*cred)->may_save = (py_may_save == Py_True);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
@@ -2650,7 +2629,7 @@
 
 	py_username = PyTuple_GetItem(ret, 0);
 	CB_CHECK_PYRETVAL(py_username);
-	if (!PyString_Check(py_username)) {
+	if (!PyUnicode_Check(py_username)) {
 		PyErr_SetString(PyExc_TypeError, "username should be string");
 		PyGILState_Release(state);
 		return py_svn_error();
@@ -2658,15 +2637,15 @@
 
 	py_password = PyTuple_GetItem(ret, 1);
 	CB_CHECK_PYRETVAL(py_password);
-	if (!PyString_Check(py_password)) {
+	if (!PyUnicode_Check(py_password)) {
 		PyErr_SetString(PyExc_TypeError, "password should be string");
 		PyGILState_Release(state);
 		return py_svn_error();
 	}
 
 	*cred = apr_pcalloc(pool, sizeof(**cred));
-	(*cred)->username = apr_pstrdup(pool, PyString_AsString(py_username));
-	(*cred)->password = apr_pstrdup(pool, PyString_AsString(py_password));
+	(*cred)->username = apr_pstrdup(pool, _PyUnicode_AsString(py_username));
+	(*cred)->password = apr_pstrdup(pool, _PyUnicode_AsString(py_password));
 	(*cred)->may_save = (py_may_save == Py_True);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
@@ -2729,7 +2708,7 @@
 	}
 
 	py_accepted_failures = PyTuple_GetItem(ret, 0);
-	if (!PyInt_Check(py_accepted_failures)) {
+	if (!PyLong_Check(py_accepted_failures)) {
 		Py_DECREF(ret);
 		PyErr_SetString(PyExc_TypeError, "accepted_failures should be integer");
 		PyGILState_Release(state);
@@ -2744,7 +2723,7 @@
 		return py_svn_error();
 	}
 
-	accepted_failures = PyInt_AsLong(py_accepted_failures);
+	accepted_failures = PyLong_AsLong(py_accepted_failures);
 	if (accepted_failures == -1 && PyErr_Occurred()) {
 		Py_DECREF(ret);
 		PyGILState_Release(state);
@@ -2803,13 +2782,13 @@
 		return py_svn_error();
 	}
 	py_password = PyTuple_GetItem(ret, 0);
-	if (!PyString_Check(py_password)) {
+	if (!PyUnicode_Check(py_password)) {
 		PyErr_SetString(PyExc_TypeError, "password should be string");
 		PyGILState_Release(state);
 		return py_svn_error();
 	}
 	*cred = apr_pcalloc(pool, sizeof(**cred));
-	(*cred)->password = apr_pstrdup(pool, PyString_AsString(py_password));
+	(*cred)->password = apr_pstrdup(pool, _PyUnicode_AsString(py_password));
 	(*cred)->may_save = (py_may_save == Py_True);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
@@ -2842,14 +2821,14 @@
 	}
 
 	py_cert_file = PyTuple_GetItem(ret, 0);
-	if (!PyString_Check(py_cert_file)) {
+	if (!PyUnicode_Check(py_cert_file)) {
 		PyErr_SetString(PyExc_TypeError, "cert_file should be string");
 		PyGILState_Release(state);
 		return py_svn_error();
 	}
 
 	*cred = apr_pcalloc(pool, sizeof(**cred));
-	(*cred)->cert_file = apr_pstrdup(pool, PyString_AsString(py_cert_file));
+	(*cred)->cert_file = apr_pstrdup(pool, _PyUnicode_AsString(py_cert_file));
 	(*cred)->may_save = (py_may_save == Py_True);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
@@ -3042,7 +3021,7 @@
 		apr_pool_destroy(pool);
 		return NULL;
 	}
-	ret = PyString_FromStringAndSize(string->data, string->len);
+	ret = PyUnicode_FromStringAndSize(string->data, string->len);
 	apr_pool_destroy(pool);
 	return ret;
 }
@@ -3217,51 +3196,51 @@
 	{ NULL, }
 };
 
-void init_ra(void)
+PyModule_Init_DEFINE(_ra)
 {
 	static apr_pool_t *pool;
-	PyObject *mod;
+	PyObject *mod = NULL;
 
 	if (PyType_Ready(&RemoteAccess_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Editor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&FileEditor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&DirectoryEditor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Reporter_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&TxDeltaWindowHandler_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Auth_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&CredentialsIter_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&AuthProvider_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&LogIterator_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	apr_initialize();
 	pool = Pool(NULL);
 	if (pool == NULL)
-		return;
+		PyModule_RETURN(mod);
 	svn_ra_initialize(pool);
 	PyEval_InitThreads();
 
-	mod = Py_InitModule3("_ra", ra_module_methods, "Remote Access");
+	PyModule_DEFINE(mod, "_ra", "Remote Access", ra_module_methods)
 	if (mod == NULL)
-		return;
+		PyModule_RETURN(mod);
 
 	PyModule_AddObject(mod, "RemoteAccess", (PyObject *)&RemoteAccess_Type);
 	Py_INCREF(&RemoteAccess_Type);
@@ -3301,4 +3280,5 @@
 #ifdef SVN_VER_REVISION
 	PyModule_AddIntConstant(mod, "SVN_REVISION", SVN_VER_REVISION);
 #endif
+	PyModule_RETURN(mod);
 }

=== modified file 'subvertpy/_ra_iter_log.c'
--- subvertpy/_ra_iter_log.c	2011-06-19 13:04:55 +0000
+++ subvertpy/_ra_iter_log.c	2012-04-07 06:08:21 +0000
@@ -114,7 +114,7 @@
 }
 
 PyTypeObject LogIterator_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.LogIterator", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(LogIteratorObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -243,17 +243,17 @@
 	}
 
 	if (message != NULL) {
-		obj = PyString_FromString(message);
+		obj = PyUnicode_FromString(message);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_LOG, obj);
 		Py_DECREF(obj);
 	}
 	if (author != NULL) {
-		obj = PyString_FromString(author);
+		obj = PyUnicode_FromString(author);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_AUTHOR, obj);
 		Py_DECREF(obj);
 	}
 	if (date != NULL) {
-		obj = PyString_FromString(date);
+		obj = PyUnicode_FromString(date);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_DATE, 
 							 obj);
 		Py_DECREF(obj);

=== modified file 'subvertpy/client.c'
--- subvertpy/client.c	2012-03-12 17:27:31 +0000
+++ subvertpy/client.c	2012-04-07 06:08:21 +0000
@@ -75,17 +75,17 @@
 
 static bool to_opt_revision(PyObject *arg, svn_opt_revision_t *ret)
 {
-    if (PyInt_Check(arg) || PyLong_Check(arg)) {
+    if (PyLong_Check(arg)) {
         ret->kind = svn_opt_revision_number;
-        ret->value.number = PyInt_AsLong(arg);
+        ret->value.number = PyLong_AsLong(arg);
         if (ret->value.number == -1 && PyErr_Occurred())
             return false;
         return true;
     } else if (arg == Py_None) {
         ret->kind = svn_opt_revision_unspecified;
         return true;
-    } else if (PyString_Check(arg)) {
-        char *text = PyString_AsString(arg);
+    } else if (PyUnicode_Check(arg)) {
+        char *text = _PyUnicode_AsString(arg);
         if (!strcmp(text, "HEAD")) {
             ret->kind = svn_opt_revision_head;
             return true;
@@ -293,10 +293,10 @@
         py_log_msg = ret;
     }
     if (py_log_msg != Py_None) {
-        *log_msg = PyString_AsString(py_log_msg);
+        *log_msg = _PyUnicode_AsString(py_log_msg);
     }
     if (py_tmp_file != Py_None) {
-        *tmp_file = PyString_AsString(py_tmp_file);
+        *tmp_file = _PyUnicode_AsString(py_tmp_file);
     }
     Py_DECREF(ret);
     PyGILState_Release(state);
@@ -546,7 +546,7 @@
         return NULL;
 #if ONLY_SINCE_SVN(1, 5)
     RUN_SVN_WITH_POOL(temp_pool, svn_client_checkout3(&result_rev, url,
-        svn_path_canonicalize(path, temp_pool),
+        svn_dirent_internal_style(path, temp_pool),
         &c_peg_rev, &c_rev, recurse?svn_depth_infinity:svn_depth_files,
         ignore_externals, allow_unver_obstructions, client->client, temp_pool));
 #else
@@ -558,7 +558,7 @@
     }
 
     RUN_SVN_WITH_POOL(temp_pool, svn_client_checkout2(&result_rev, url,
-        svn_path_canonicalize(path, temp_pool),
+        svn_dirent_internal_style(path, temp_pool),
         &c_peg_rev, &c_rev, recurse,
         ignore_externals, client->client, temp_pool));
 #endif
@@ -655,13 +655,13 @@
         return NULL;
 #if ONLY_SINCE_SVN(1, 5)
     RUN_SVN_WITH_POOL(temp_pool, svn_client_export4(&result_rev, from,
-        svn_path_canonicalize(to, temp_pool),
+        svn_dirent_internal_style(to, temp_pool),
         &c_peg_rev, &c_rev, overwrite, ignore_externals,
 		recurse?svn_depth_infinity:svn_depth_files,
         native_eol, client->client, temp_pool));
 #else
     RUN_SVN_WITH_POOL(temp_pool, svn_client_export3(&result_rev, from,
-        svn_path_canonicalize(to, temp_pool),
+        svn_dirent_internal_style(to, temp_pool),
         &c_peg_rev, &c_rev, overwrite, ignore_externals, recurse,
         native_eol, client->client, temp_pool));
 #endif
@@ -1280,7 +1280,6 @@
     apr_array_header_t *c_diffopts;
     PyObject *outfile, *errfile;
     apr_file_t *c_outfile, *c_errfile;
-    apr_off_t offset;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO|zzzOsbbb:diff", kwnames,
                                      &rev1, &rev2, &path1, &path2,
@@ -1313,34 +1312,18 @@
     }
     Py_DECREF(diffopts);
 
-    outfile = PyOS_tmpfile();
+    outfile = PyOS_tmpfile(&c_outfile, temp_pool);
     if (outfile == NULL) {
         apr_pool_destroy(temp_pool);
         return NULL;
     }
-    errfile = PyOS_tmpfile();
+    errfile = PyOS_tmpfile(&c_errfile, temp_pool);
     if (errfile == NULL) {
         apr_pool_destroy(temp_pool);
         Py_DECREF(outfile);
         return NULL;
     }
 
-    c_outfile = apr_file_from_object(outfile, temp_pool);
-    if (c_outfile == NULL) {
-        apr_pool_destroy(temp_pool);
-        Py_DECREF(outfile);
-        Py_DECREF(errfile);
-        return NULL;
-    }
-
-    c_errfile = apr_file_from_object(errfile, temp_pool);
-    if (c_errfile == NULL) {
-        apr_pool_destroy(temp_pool);
-        Py_DECREF(outfile);
-        Py_DECREF(errfile);
-        return NULL;
-    }
-
     RUN_SVN_WITH_POOL(temp_pool,
                       svn_client_diff4(c_diffopts,
                                        path1, &c_rev1, path2, &c_rev2,
@@ -1350,10 +1333,6 @@
                                        c_outfile, c_errfile, NULL,
                                        client->client, temp_pool));
 
-    offset = 0;
-    apr_file_seek(c_outfile, APR_SET, &offset);
-    offset = 0;
-    apr_file_seek(c_errfile, APR_SET, &offset);
 
     apr_pool_destroy(temp_pool);
 
@@ -1601,7 +1580,7 @@
 	RUN_SVN_WITH_POOL(pool, svn_wc_get_default_ignores(&patterns, configobj->config, pool));
 	ret = PyList_New(patterns->nelts);
 	for (i = 0; i < patterns->nelts; i++) {
-		PyObject *item = PyString_FromString(APR_ARRAY_IDX(patterns, i, char *));
+		PyObject *item = PyUnicode_FromString(APR_ARRAY_IDX(patterns, i, char *));
 		if (item == NULL) {
 			apr_pool_destroy(pool);
 			Py_DECREF(item);
@@ -1634,7 +1613,7 @@
 }
 
 PyTypeObject Config_Type = {
-    PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
     "client.Config", /*    const char *tp_name;  For printing, in format "<module>.<name>" */
     sizeof(ConfigObject),  /*  tp_basicsize    */
     0,  /*    tp_itemsize;  For allocation */
@@ -1702,7 +1681,7 @@
 }
 
 PyTypeObject ConfigItem_Type = {
-    PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
     "client.ConfigItem", /*    const char *tp_name;  For printing, in format "<module>.<name>" */
     sizeof(ConfigItemObject),
     0,/*    Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -1756,7 +1735,7 @@
 };
 
 PyTypeObject Info_Type = {
-    PyObject_HEAD_INIT(NULL) 0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "client.Info", /*   const char *tp_name;  For printing, in format "<module>.<name>" */
     sizeof(InfoObject),
     0,/*    Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -1856,7 +1835,7 @@
 }
 
 PyTypeObject WCInfo_Type = {
-    PyObject_HEAD_INIT(NULL) 0,
+    PyVarObject_HEAD_INIT(NULL, 0)
     "client.Info", /*   const char *tp_name;  For printing, in format "<module>.<name>" */
     sizeof(WCInfoObject),
     0,/*    Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -1918,7 +1897,7 @@
 };
 
 PyTypeObject Client_Type = {
-    PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
     /*    PyObject_VAR_HEAD    */
     "client.Client", /*    const char *tp_name;  For printing, in format "<module>.<name>" */
     sizeof(ClientObject),
@@ -2054,44 +2033,45 @@
 	{ NULL }
 };
 
-void initclient(void)
+PyModule_Init_DEFINE(client)
 {
-    PyObject *mod;
-
-    if (PyType_Ready(&Client_Type) < 0)
-        return;
-
-    if (PyType_Ready(&Config_Type) < 0)
-        return;
-
-    if (PyType_Ready(&ConfigItem_Type) < 0)
-        return;
+	PyObject *mod = NULL;
+
+	if (PyType_Ready(&Client_Type) < 0)
+		PyModule_RETURN(mod);
+
+	if (PyType_Ready(&Config_Type) < 0)
+		PyModule_RETURN(mod);
+
+	if (PyType_Ready(&ConfigItem_Type) < 0)
+		PyModule_RETURN(mod);
 
     if (PyType_Ready(&Info_Type) < 0)
-        return;
+        PyModule_RETURN(mod);
 
     if (PyType_Ready(&WCInfo_Type) < 0)
-        return;
+        PyModule_RETURN(mod);
 
     /* Make sure APR is initialized */
     apr_initialize();
 
-    mod = Py_InitModule3("client", client_mod_methods, "Client methods");
-    if (mod == NULL)
-        return;
-
-    Py_INCREF(&Client_Type);
-    PyModule_AddObject(mod, "Client", (PyObject *)&Client_Type);
-
-    PyModule_AddObject(mod, "depth_empty",
-                       (PyObject *)PyLong_FromLong(svn_depth_empty));
-    PyModule_AddObject(mod, "depth_files",
-                       (PyObject *)PyLong_FromLong(svn_depth_files));
-    PyModule_AddObject(mod, "depth_immediates",
-                       (PyObject *)PyLong_FromLong(svn_depth_immediates));
-    PyModule_AddObject(mod, "depth_infinity",
-                       (PyObject *)PyLong_FromLong(svn_depth_infinity));
+	PyModule_DEFINE(mod, "client", "Client methods", client_mod_methods)
+	if (mod == NULL)
+		PyModule_RETURN(mod);
+
+	Py_INCREF(&Client_Type);
+	PyModule_AddObject(mod, "Client", (PyObject *)&Client_Type);
+
+	PyModule_AddObject(mod, "depth_empty",
+					   (PyObject *)PyLong_FromLong(svn_depth_empty));
+	PyModule_AddObject(mod, "depth_files",
+					   (PyObject *)PyLong_FromLong(svn_depth_files));
+	PyModule_AddObject(mod, "depth_immediates",
+					   (PyObject *)PyLong_FromLong(svn_depth_immediates));
+	PyModule_AddObject(mod, "depth_infinity",
+					   (PyObject *)PyLong_FromLong(svn_depth_infinity));
 
 	Py_INCREF(&Config_Type);
 	PyModule_AddObject(mod, "Config", (PyObject *)&Config_Type);
+	PyModule_RETURN(mod);
 }

=== modified file 'subvertpy/delta.py'
--- subvertpy/delta.py	2010-12-06 16:46:21 +0000
+++ subvertpy/delta.py	2012-04-07 06:08:21 +0000
@@ -38,8 +38,7 @@
 
 DELTA_WINDOW_SIZE = 102400
 
-def apply_txdelta_window(sbuf,
-            (sview_offset, sview_len, tview_len, src_ops, ops, new_data)):
+def apply_txdelta_window(sbuf, xxx_todo_changeme):
     """Apply a txdelta window to a buffer.
 
     :param sbuf: Source buffer (as bytestring)
@@ -51,6 +50,7 @@
     :param new_data: Buffer with possible new data
     :return: Target buffer
     """
+    (sview_offset, sview_len, tview_len, src_ops, ops, new_data) = xxx_todo_changeme
     sview = sbuf[sview_offset:sview_offset+sview_len]
     tview = txdelta_apply_ops(src_ops, ops, new_data, sview)
     if len(tview) != tview_len:
@@ -100,7 +100,7 @@
             # Copy from source area.
             tview += sview[offset:offset+length]
         elif action == TXDELTA_TARGET:
-            for i in xrange(length):
+            for i in range(length):
                 tview += tview[offset+i]
         elif action == TXDELTA_NEW:
             tview += new_data[offset:offset+length]
@@ -117,12 +117,12 @@
     :return: MD5 hash over the stream
     """
     hash = md5()
-    text = stream.read(block_size)
-    while text != "":
+    text = stream.read(block_size).encode("utf-8")
+    while text != b"":
         hash.update(text)
         window = (0, 0, len(text), 0, [(TXDELTA_NEW, 0, len(text))], text)
         handler(window)
-        text = stream.read(block_size)
+        text = stream.read(block_size).encode("utf-8")
     handler(None)
     return hash.digest()
 
@@ -174,7 +174,7 @@
     return ret, text
 
 
-def pack_svndiff_instruction((action, offset, length)):
+def pack_svndiff_instruction(xxx_todo_changeme1):
     """Pack a SVN diff instruction
 
     :param action: Action
@@ -182,6 +182,7 @@
     :param length: Length
     :return: encoded text
     """
+    (action, offset, length) = xxx_todo_changeme1
     if length < 0x3f:
         text = chr((action << 6) + length)
     else:

=== modified file 'subvertpy/editor.c'
--- subvertpy/editor.c	2011-09-19 23:00:08 +0000
+++ subvertpy/editor.c	2012-04-07 06:08:21 +0000
@@ -120,8 +120,9 @@
 	if (py_new_data == Py_None) {
 		window.new_data = NULL;
 	} else {
-		new_data.data = PyString_AsString(py_new_data);
-		new_data.len = PyString_Size(py_new_data);
+		if (PyBytes_AsStringAndSize(py_new_data, (char**)&new_data.data, (Py_ssize_t *)&new_data.len) < 0) {
+			return NULL;
+		}
 		window.new_data = &new_data;
 	}
 
@@ -164,7 +165,7 @@
 }
 
 PyTypeObject TxDeltaWindowHandler_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.TxDeltaWindowHandler", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(TxDeltaWindowHandlerObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -301,8 +302,8 @@
 	{ NULL }
 };
 
-PyTypeObject FileEditor_Type = { 
-	PyObject_HEAD_INIT(NULL) 0, 
+PyTypeObject FileEditor_Type = {
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.FileEditor", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(EditorObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -676,8 +677,8 @@
 	{ NULL, }
 };
 
-PyTypeObject DirectoryEditor_Type = { 
-	PyObject_HEAD_INIT(NULL) 0,
+PyTypeObject DirectoryEditor_Type = {
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.DirEditor", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(EditorObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -879,8 +880,8 @@
 	{ NULL }
 };
 
-PyTypeObject Editor_Type = { 
-	PyObject_HEAD_INIT(NULL) 0,
+PyTypeObject Editor_Type = {
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"_ra.Editor", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(EditorObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -1106,7 +1107,7 @@
 			}
 		}
 		if (window->new_data != NULL && window->new_data->data != NULL) {
-			py_new_data = PyString_FromStringAndSize(window->new_data->data,
+			py_new_data = PyBytes_FromStringAndSize(window->new_data->data,
 													 window->new_data->len);
 		} else {
 			py_new_data = Py_None;

=== modified file 'subvertpy/marshall.py'
--- subvertpy/marshall.py	2009-02-21 22:11:21 +0000
+++ subvertpy/marshall.py	2012-04-07 06:08:21 +0000
@@ -65,7 +65,7 @@
         return "%s " % x
     elif type(x) is str:
         return "%d:%s " % (len(x), x)
-    elif type(x) is unicode:
+    elif type(x) is str:
         return "%d:%s " % (len(x), x.encode("utf-8"))
     elif type(x) is bool:
         if x == True:

=== modified file 'subvertpy/properties.py'
--- subvertpy/properties.py	2011-01-22 23:37:15 +0000
+++ subvertpy/properties.py	2012-04-07 06:08:21 +0000
@@ -18,7 +18,7 @@
 __author__ = "Jelmer Vernooij <[e-mail]>"
 __docformat__ = "restructuredText"
 
-import bisect, calendar, time, urlparse
+import bisect, calendar, time, urllib.parse
 
 
 class InvalidExternalsDescription(Exception):
@@ -61,7 +61,7 @@
     assert usecstr[-1] == "Z"
     tm_usec = int(usecstr[:-1])
     tm = time.strptime(basestr, "%Y-%m-%dT%H:%M:%S")
-    return (long(calendar.timegm(tm)) * 1000000 + tm_usec)
+    return (int(calendar.timegm(tm)) * 1000000 + tm_usec)
 
 
 def parse_externals_description(base_url, val):
@@ -117,7 +117,7 @@
             raise NotImplementedError("Relative to the scheme externals not yet supported")
         if relurl.startswith("^/"):
             raise NotImplementedError("Relative to the repository root externals not yet supported")
-        ret[path] = (revno, urlparse.urljoin(base_url+"/", relurl))
+        ret[path] = (revno, urllib.parse.urljoin(base_url+"/", relurl))
     return ret
 
 
@@ -152,7 +152,8 @@
     :param merges: dictionary mapping paths to lists of ranges
     :return: Property contents
     """
-    def formatrange((start, end, inheritable)):
+    def formatrange(xxx_todo_changeme):
+        (start, end, inheritable) = xxx_todo_changeme
         suffix = ""
         if not inheritable:
             suffix = "*"
@@ -161,7 +162,7 @@
         else:
             return "%d-%d%s" % (start, end, suffix)
     text = ""
-    for (path, ranges) in merges.iteritems():
+    for (path, ranges) in merges.items():
         assert path.startswith("/")
         text += "%s:%s\n" % (path, ",".join(map(formatrange, ranges)))
     return text
@@ -279,7 +280,7 @@
              with the old and the new property value.
     """
     ret = {}
-    for key, newval in current.iteritems():
+    for key, newval in current.items():
         oldval = previous.get(key)
         if oldval != newval:
             ret[key] = (oldval, newval)

=== added file 'subvertpy/py_fixup.h'
--- subvertpy/py_fixup.h	1970-01-01 00:00:00 +0000
+++ subvertpy/py_fixup.h	2012-04-07 06:08:21 +0000
@@ -0,0 +1,118 @@
+
+#ifndef PY_FIXUP_H
+#define PY_FIXUP_H
+
+/*Macros and functions to ease compatibility with Python 2 and Python 3.*/
+
+#if PY_VERSION_HEX >= 0x03000000 && PY_VERSION_HEX < 0x03010000
+#error Python 3.0 is not supported.  Please use 3.1 and higher.
+#endif
+
+/*Macros introduced in 2.6, backported for 2.4 and 2.5.*/
+#ifndef PyVarObject_HEAD_INIT
+#define PyVarObject_HEAD_INIT(type, size) PyObject_HEAD_INIT(type) size,
+#endif
+#ifndef Py_TYPE
+#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
+#endif
+
+/*Fixup for MSVC inline.*/
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
+/*Used for items that are ANSI in Python 2 and Unicode in Python 3 or in int 2 and long in 3.*/
+
+#if PY_MAJOR_VERSION >= 3
+  #define PyModule_DEFINE(ob, name, doc, methods) \
+      {static struct PyModuleDef module_##ob = { \
+          PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
+      ob = PyModule_Create(&module_##ob);}
+
+  #define PyModule_Init_DEFINE(module_name) PyMODINIT_FUNC PyInit_##module_name(void)
+  #define PyModule_RETURN(v) return (v)
+  #define PyString_FromString PyUnicode_FromString
+  #define PyString_FromStringAndSize PyUnicode_FromStringAndSize
+  #define PyString_Check PyUnicode_Check
+  #define PyString_Type PyUnicode_Type
+  #define PyString_Size PyUnicode_Size
+  #define PyInt_FromLong PyLong_FromLong
+  #define PyInt_AsLong PyLong_AsLong
+  #define PyInt_AS_LONG PyLong_AS_LONG
+  #define PyInt_Type PyLong_Type
+  #define PyString_FromFormatV PyUnicode_FromFormatV   
+  #define PyString_FromFormat PyUnicode_FromFormat
+  #define Py_TPFLAGS_HAVE_ITER 0
+
+  #define PyString_AsString PyUnicode_AsString
+
+  #define PyTEXT_T Py_UNICODE
+
+  #define PyString_Join PyUnicode_Join
+
+static inline void PyString_ConcatAndDel(PyObject** lhs, PyObject* rhs)
+{
+    PyUnicode_Concat(*lhs, rhs);
+    Py_DECREF(rhs);
+}
+
+#else
+  #include <stringobject.h>
+  #include <intobject.h>
+  #include <bufferobject.h>
+
+  #define PyModule_DEFINE(ob, name, doc, methods) \
+      ob = Py_InitModule3(name, methods, doc);
+
+  #define PyModule_Init_DEFINE(module_name) void init##module_name(void)
+  #define PyModule_RETURN(v)
+
+  #define PyTEXT_T char
+
+  #define PyString_Join _PyString_Join
+
+#endif
+
+static inline PyObject* PyText_New(Py_ssize_t length)
+{
+    /*Returns a new, uninitialized String (Python 2) or Unicode object (Python 3) object.*/
+#if PY_MAJOR_VERSION < 3
+    return PyString_FromStringAndSize(0, length);
+#else
+    return PyUnicode_FromUnicode(0, length);
+#endif
+}
+
+static inline PyTEXT_T* PyText_Buffer(PyObject* o)
+{
+#if PY_MAJOR_VERSION < 3
+    return PyString_AS_STRING(o);
+#else
+    return PyUnicode_AS_UNICODE(o);
+#endif
+}
+
+
+static inline bool PyText_Check(PyObject* o)
+{
+    /*A compatibility function that determines if the object is a string, based on the version of Python.
+     For Python 2, an ASCII or Unicode string is allowed.  For Python 3, it must be a Unicode object.*/
+#if PY_MAJOR_VERSION < 3
+    if (o && PyString_Check(o))
+        return true;
+#endif
+    return o && PyUnicode_Check(o);
+}
+
+
+static inline Py_ssize_t PyText_Size(PyObject* o)
+{
+#if PY_MAJOR_VERSION < 3
+    if (o && PyString_Check(o))
+        return PyString_GET_SIZE(o);
+#endif
+    return (o && PyUnicode_Check(o)) ? PyUnicode_GET_SIZE(o) : 0;
+}
+
+
+#endif /*PY_FIXUP_H*/

=== modified file 'subvertpy/ra.py'
--- subvertpy/ra.py	2009-02-21 22:11:21 +0000
+++ subvertpy/ra.py	2012-04-07 06:08:21 +0000
@@ -19,11 +19,11 @@
 
 from subvertpy import SubversionException, ERR_BAD_URL 
 
-import _ra
-from _ra import *
-import ra_svn
+from . import _ra
+from ._ra import *
+from . import ra_svn
 
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 url_handlers = {
         "svn": _ra.RemoteAccess,
@@ -41,7 +41,7 @@
     :param url: URL to connect to
     :return: RemoteAccess object
     """
-    (type, opaque) = urllib.splittype(url)
+    (type, opaque) = urllib.parse.splittype(url)
     if not type in url_handlers:
         raise SubversionException("Unknown URL type '%s'" % type, ERR_BAD_URL)
     return url_handlers[type](url, *args, **kwargs)

=== modified file 'subvertpy/ra_svn.py'
--- subvertpy/ra_svn.py	2011-01-14 18:42:54 +0000
+++ subvertpy/ra_svn.py	2012-04-07 06:08:21 +0000
@@ -17,12 +17,12 @@
 
 __author__ = "Jelmer Vernooij <[e-mail]>"
 
-import SocketServer
+import socketserver
 import base64
 import os
 import socket
 import subprocess
-import urllib
+import urllib.request, urllib.parse, urllib.error
 
 from subvertpy import (
     ERR_RA_SVN_UNKNOWN_CMD,
@@ -419,9 +419,9 @@
     def __init__(self, url, progress_cb=None, auth=None, config=None, 
                  client_string_func=None, open_tmp_file_func=None):
         self.url = url
-        (type, opaque) = urllib.splittype(url)
+        (type, opaque) = urllib.parse.splittype(url)
         assert type in ("svn", "svn+ssh")
-        (host, path) = urllib.splithost(opaque)
+        (host, path) = urllib.parse.splithost(opaque)
         self._progress_cb = progress_cb
         self._auth = auth
         self._config = config
@@ -467,7 +467,7 @@
     _recv_ack = _unpack
 
     def _connect(self, host):
-        (host, port) = urllib.splitnport(host, SVN_PORT)
+        (host, port) = urllib.parse.splitnport(host, SVN_PORT)
         sockaddrs = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
                socket.SOCK_STREAM, 0, 0)
         self._socket = None
@@ -475,7 +475,7 @@
             try:
                 self._socket = socket.socket(family, socktype, proto)
                 self._socket.connect(sockaddr)
-            except socket.error, err:
+            except socket.error as err:
                 if self._socket is not None:
                     self._socket.close()
                 self._socket = None
@@ -487,12 +487,12 @@
         return (self._socket.recv, self._socket.send)
 
     def _connect_ssh(self, host):
-        (user, host) = urllib.splituser(host)
+        (user, host) = urllib.parse.splituser(host)
         if user is not None:
             (user, password) = urllib.splitpassword(user)
         else:
             password = None
-        (host, port) = urllib.splitnport(host, 22)
+        (host, port) = urllib.parse.splitnport(host, 22)
         self._tunnel = get_ssh_vendor().connect_ssh(user, password, host, port, ["svnserve", "-t"])
         return (self._tunnel.recv, self._tunnel.send)
 
@@ -643,12 +643,12 @@
                           keep_locks=False):
         args = [revprops[properties.PROP_REVISION_LOG]]
         if lock_tokens is not None:
-            args.append(lock_tokens.items())
+            args.append(list(lock_tokens.items()))
         else:
             args.append([])
         args.append(keep_locks)
         if len(revprops) > 1:
-            args.append(revprops.items())
+            args.append(list(revprops.items()))
         self.send_msg([literal("commit"), args])
         self._recv_ack()
         raise NotImplementedError(self.get_commit_editor)
@@ -894,7 +894,7 @@
         def send_revision(revno, author, date, message, changed_paths=None):
             changes = []
             if changed_paths is not None:
-                for p, (action, cf, cr) in changed_paths.iteritems():
+                for p, (action, cf, cr) in changed_paths.items():
                     if cf is not None:
                         changes.append((p, literal(action), (cf, cr)))
                     else:
@@ -915,7 +915,7 @@
         self.send_success()
 
     def open_backend(self, url):
-        (rooturl, location) = urllib.splithost(url)
+        (rooturl, location) = urllib.parse.splithost(url)
         self.repo_backend, self.relpath = self.backend.open_repository(location)
 
     def reparent(self, parent):
@@ -952,7 +952,7 @@
     def rev_proplist(self, revnum):
         self.send_ack()
         revprops = self.repo_backend.rev_proplist(revnum)
-        self.send_success(revprops.items())
+        self.send_success(list(revprops.items()))
 
     def rev_prop(self, revnum, name):
         self.send_ack()
@@ -965,7 +965,7 @@
     def get_locations(self, path, peg_revnum, revnums):
         self.send_ack()
         locations = self.repo_backend.get_locations(path, peg_revnum, revnums)
-        for rev, path in locations.iteritems():
+        for rev, path in locations.items():
             self.send_msg([rev, path])
         self.send_msg(literal("done"))
         self.send_success()
@@ -1047,7 +1047,7 @@
         # Expect:
         while not self._stop:
             ( cmd, args ) = self.recv_msg()
-            if not self.commands.has_key(cmd):
+            if cmd not in self.commands:
                 self.mutter("client used unknown command %r" % cmd)
                 self.send_unknown(cmd)
                 return
@@ -1062,11 +1062,11 @@
             self._logf.write("%s\n" % text)
 
 
-class TCPSVNRequestHandler(SocketServer.StreamRequestHandler):
+class TCPSVNRequestHandler(socketserver.StreamRequestHandler):
 
     def __init__(self, request, client_address, server):
         self._server = server
-        SocketServer.StreamRequestHandler.__init__(self, request, 
+        socketserver.StreamRequestHandler.__init__(self, request, 
             client_address, server)
 
     def handle(self):
@@ -1074,19 +1074,19 @@
             self.wfile.write, self._server._logf)
         try:
             server.serve()
-        except socket.error, e:
+        except socket.error as e:
             if e.args[0] == 32:# EPIPE
                 return
             raise
 
 
-class TCPSVNServer(SocketServer.TCPServer):
+class TCPSVNServer(socketserver.TCPServer):
 
     allow_reuse_address = True
-    serve = SocketServer.TCPServer.serve_forever
+    serve = socketserver.TCPServer.serve_forever
 
     def __init__(self, backend, addr, logf=None):
         self._logf = logf
         self._backend = backend
-        SocketServer.TCPServer.__init__(self, addr, TCPSVNRequestHandler)
+        socketserver.TCPServer.__init__(self, addr, TCPSVNRequestHandler)
 

=== modified file 'subvertpy/repos.c'
--- subvertpy/repos.c	2011-09-20 21:18:26 +0000
+++ subvertpy/repos.c	2012-04-07 06:08:21 +0000
@@ -62,9 +62,9 @@
 		PyErr_SetString(PyExc_RuntimeError, "Unable to create fs config hash");
 		return NULL;
 	}
-    RUN_SVN_WITH_POOL(pool, svn_repos_create(&repos,
-                svn_path_canonicalize(path, pool), NULL, NULL,
-                hash_config, hash_fs_config, pool));
+	RUN_SVN_WITH_POOL(pool, svn_repos_create(&repos,
+				svn_dirent_internal_style(path, pool), NULL, NULL,
+				hash_config, hash_fs_config, pool));
 
 	ret = PyObject_New(RepositoryObject, &Repository_Type);
 	if (ret == NULL)
@@ -104,8 +104,8 @@
 		return NULL;
 	}
 	Py_BEGIN_ALLOW_THREADS
-	err = svn_repos_open(&ret->repos, svn_path_canonicalize(path, ret->pool),
-                            ret->pool);
+	err = svn_repos_open(&ret->repos, svn_dirent_internal_style(path, ret->pool),
+			ret->pool);
 	Py_END_ALLOW_THREADS
 
 	if (err != NULL) {
@@ -165,7 +165,7 @@
 	if (temp_pool == NULL)
 		return NULL;
 	RUN_SVN_WITH_POOL(temp_pool, svn_fs_get_uuid(fsobj->fs, &uuid, temp_pool));
-	ret = PyString_FromString(uuid);
+	ret = PyUnicode_FromString(uuid);
 	apr_pool_destroy(temp_pool);
 
 	return ret;
@@ -181,7 +181,7 @@
 	if (temp_pool == NULL)
 		return NULL;
 	RUN_SVN_WITH_POOL(temp_pool, svn_fs_youngest_rev(&rev, self->fs, temp_pool));
-	ret = PyInt_FromLong(rev);
+	ret = PyLong_FromLong(rev);
 	apr_pool_destroy(temp_pool);
 
 	return ret;
@@ -252,7 +252,7 @@
 }
 
 PyTypeObject FileSystem_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"repos.FileSystem", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(FileSystemObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -517,7 +517,7 @@
 };
 
 PyTypeObject Repository_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"repos.Repository", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(RepositoryObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -607,7 +607,7 @@
 		apr_pool_destroy(temp_pool);
 		return NULL;
 	}
-	return PyString_FromStringAndSize(str->data, str->len);
+	return PyBytes_FromStringAndSize(str->data, str->len);
 }
 
 #if ONLY_BEFORE_SVN(1, 6)
@@ -759,7 +759,7 @@
 	RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_length(&filesize, self->root, 
 											   path, temp_pool));
 	apr_pool_destroy(temp_pool);
-	return PyInt_FromLong(filesize);
+	return PyLong_FromUnsignedLongLong(filesize);
 }
 
 static PyObject *fs_node_file_proplist(FileSystemRootObject *self, PyObject *args)
@@ -812,7 +812,7 @@
 		ret = Py_None;
 		Py_INCREF(ret);
 	} else {
-		ret = PyString_FromString(cstr);
+		ret = PyBytes_FromString(cstr);
 	}
 #else
 	if (kind > 0)  {
@@ -823,7 +823,7 @@
 	RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_md5_checksum(checksum, 
 													  self->root, 
 											   path, temp_pool));
-	ret = PyString_FromStringAndSize((char *)checksum, APR_MD5_DIGESTSIZE);
+	ret = PyBytes_FromStringAndSize((char *)checksum, APR_MD5_DIGESTSIZE);
 #endif
 	apr_pool_destroy(temp_pool);
 	return ret;
@@ -868,7 +868,7 @@
 };
 
 PyTypeObject FileSystemRoot_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"repos.FileSystemRoot", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(FileSystemRootObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -928,48 +928,48 @@
 };
 
 
-void initrepos(void)
+PyModule_Init_DEFINE(repos)
 {
 	static apr_pool_t *pool;
-	PyObject *mod;
+	PyObject *mod = NULL;
 
 	if (PyType_Ready(&Repository_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&FileSystem_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&FileSystemRoot_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Stream_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	apr_initialize();
 	pool = Pool(NULL);
 	if (pool == NULL)
-		return;
+		PyModule_RETURN(mod);
 
 	svn_fs_initialize(pool);
 
-	mod = Py_InitModule3("repos", repos_module_methods, "Local repository management");
+	PyModule_DEFINE(mod, "repos", "Local repository management", repos_module_methods)
 	if (mod == NULL)
-		return;
+		PyModule_RETURN(mod);
 
 	PyModule_AddObject(mod, "LOAD_UUID_DEFAULT", PyLong_FromLong(svn_repos_load_uuid_default));
 	PyModule_AddObject(mod, "LOAD_UUID_IGNORE", PyLong_FromLong(svn_repos_load_uuid_ignore));
 	PyModule_AddObject(mod, "LOAD_UUID_FORCE", PyLong_FromLong(svn_repos_load_uuid_force));
 
-	PyModule_AddObject(mod, "PATH_CHANGE_MODIFY", PyInt_FromLong(svn_fs_path_change_modify));
-	PyModule_AddObject(mod, "PATH_CHANGE_ADD", PyInt_FromLong(svn_fs_path_change_add));
-	PyModule_AddObject(mod, "PATH_CHANGE_DELETE", PyInt_FromLong(svn_fs_path_change_delete));
-	PyModule_AddObject(mod, "PATH_CHANGE_REPLACE", PyInt_FromLong(svn_fs_path_change_replace));
+	PyModule_AddObject(mod, "PATH_CHANGE_MODIFY", PyLong_FromLong(svn_fs_path_change_modify));
+	PyModule_AddObject(mod, "PATH_CHANGE_ADD", PyLong_FromLong(svn_fs_path_change_add));
+	PyModule_AddObject(mod, "PATH_CHANGE_DELETE", PyLong_FromLong(svn_fs_path_change_delete));
+	PyModule_AddObject(mod, "PATH_CHANGE_REPLACE", PyLong_FromLong(svn_fs_path_change_replace));
 
 #if ONLY_SINCE_SVN(1, 6)
-	PyModule_AddObject(mod, "CHECKSUM_MD5", PyInt_FromLong(svn_checksum_md5));
-	PyModule_AddObject(mod, "CHECKSUM_SHA1", PyInt_FromLong(svn_checksum_sha1));
+	PyModule_AddObject(mod, "CHECKSUM_MD5", PyLong_FromLong(svn_checksum_md5));
+	PyModule_AddObject(mod, "CHECKSUM_SHA1", PyLong_FromLong(svn_checksum_sha1));
 #else
-	PyModule_AddObject(mod, "CHECKSUM_MD5", PyInt_FromLong(0));
+	PyModule_AddObject(mod, "CHECKSUM_MD5", PyLong_FromLong(0));
 #endif
 
 	PyModule_AddObject(mod, "Repository", (PyObject *)&Repository_Type);
@@ -977,4 +977,5 @@
 
 	PyModule_AddObject(mod, "Stream", (PyObject *)&Stream_Type);
 	Py_INCREF(&Stream_Type);
+	PyModule_RETURN(mod);
 }

=== modified file 'subvertpy/tests/__init__.py'
--- subvertpy/tests/__init__.py	2012-03-12 16:32:02 +0000
+++ subvertpy/tests/__init__.py	2012-04-07 06:08:21 +0000
@@ -19,7 +19,7 @@
 __author__ = 'Jelmer Vernooij <[e-mail]>'
 __docformat__ = 'restructuredText'
 
-from cStringIO import StringIO
+from io import StringIO
 import os
 import shutil
 import stat
@@ -33,9 +33,8 @@
         from unittest2 import SkipTest
     except ImportError:
         from testtools.testcase import TestSkipped as SkipTest
-import urllib2
-import urllib
-import urlparse
+import urllib.request, urllib.error, urllib.parse
+import urllib.parse
 
 from subvertpy import (
     client,
@@ -160,7 +159,7 @@
     def add_dir(self, path, copyfrom_path=None, copyfrom_rev=-1):
         self.close_children()
         if copyfrom_path is not None:
-            copyfrom_path = urlparse.urljoin(self.baseurl+"/", copyfrom_path)
+            copyfrom_path = urllib.parse.urljoin(self.baseurl+"/", copyfrom_path)
         if copyfrom_path is not None and copyfrom_rev == -1:
             copyfrom_rev = self.revnum
         assert (copyfrom_path is None and copyfrom_rev == -1) or \
@@ -173,7 +172,7 @@
     def add_file(self, path, copyfrom_path=None, copyfrom_rev=-1):
         self.close_children()
         if copyfrom_path is not None:
-            copyfrom_path = urlparse.urljoin(self.baseurl+"/", copyfrom_path)
+            copyfrom_path = urllib.parse.urljoin(self.baseurl+"/", copyfrom_path)
         if copyfrom_path is not None and copyfrom_rev == -1:
             copyfrom_rev = self.revnum
         child = TestFileEditor(self.dir.add_file(path, copyfrom_path,
@@ -249,10 +248,10 @@
                     f.write("#!/bin/sh\n")
                 finally:
                     f.close()
-                os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0111)
+                os.chmod(revprop_hook, os.stat(revprop_hook).st_mode | 0o111)
 
         if sys.platform == 'win32':
-            return 'file:%s' % urllib.pathname2url(abspath)
+            return 'file:%s' % urllib.request.pathname2url(abspath)
         else:
             return "file://%s" % abspath
 
@@ -277,7 +276,7 @@
         if recursive:
             return ret
         else:
-            return ret.values()[0]
+            return list(ret.values())[0]
 
     def client_get_revprop(self, url, revnum, name):
         """Get the revision property.
@@ -379,7 +378,7 @@
         :param files: Dictionary with filenames as keys, contents as
             values. None as value indicates a directory.
         """
-        for name, content in files.iteritems():
+        for name, content in files.items():
             if content is None:
                 try:
                     os.makedirs(name)
@@ -423,7 +422,7 @@
         :param message: Commit message
         :return: Commit editor object
         """
-        ra_ctx = RemoteAccess(url.encode("utf-8"),
+        ra_ctx = RemoteAccess(url,
             auth=Auth([ra.get_username_provider()]))
         revnum = ra_ctx.get_latest_revnum()
         return TestCommitEditor(ra_ctx.get_commit_editor({"svn:log": message}),

=== modified file 'subvertpy/tests/test_client.py'
--- subvertpy/tests/test_client.py	2012-03-04 20:32:19 +0000
+++ subvertpy/tests/test_client.py	2012-04-07 06:08:21 +0000
@@ -17,7 +17,7 @@
 
 from datetime import datetime, timedelta
 import os
-from StringIO import StringIO
+from io import StringIO
 import shutil
 import tempfile
 
@@ -37,10 +37,10 @@
 class VersionTest(TestCase):
 
     def test_version_length(self):
-        self.assertEquals(4, len(client.version()))
+        self.assertEqual(4, len(client.version()))
 
     def test_api_version_length(self):
-        self.assertEquals(4, len(client.api_version()))
+        self.assertEqual(4, len(client.api_version()))
 
     def test_api_version_later_same(self):
         self.assertTrue(client.api_version() <= client.version())
@@ -69,7 +69,7 @@
         self.client.commit(["dc"])
         r = ra.RemoteAccess(self.repos_url)
         revprops = r.rev_proplist(1)
-        self.assertEquals("Amessage", revprops["svn:log"])
+        self.assertEqual("Amessage", revprops["svn:log"])
 
     def test_commit_start(self):
         self.build_tree({"dc/foo": None})
@@ -79,7 +79,7 @@
         self.client.commit(["dc"])
         r = ra.RemoteAccess(self.repos_url)
         revprops = r.rev_proplist(1)
-        self.assertEquals("Bmessage", revprops["svn:log"])
+        self.assertEqual("Bmessage", revprops["svn:log"])
 
     def test_mkdir(self):
         self.client.mkdir(["dc/foo"])
@@ -91,18 +91,18 @@
         self.client.add("dc/foo")
         self.client.commit(["dc"])
         self.client.export(self.repos_url, "de")
-        self.assertEquals(["foo"], os.listdir("de"))
+        self.assertEqual(["foo"], os.listdir("de"))
 
     def test_add_recursive(self):
         self.build_tree({"dc/trunk/foo": 'bla', "dc/trunk": None})
         self.client.add("dc/trunk")
         adm = wc.WorkingCopy(None, os.path.join(os.getcwd(), "dc"))
         e = adm.entry(os.path.join(os.getcwd(), "dc", "trunk"))
-        self.assertEquals(e.kind, NODE_DIR)
+        self.assertEqual(e.kind, NODE_DIR)
         adm2 = wc.WorkingCopy(None, os.path.join(os.getcwd(), "dc", "trunk"))
         e = adm2.entry(os.path.join(os.getcwd(), "dc", "trunk", "foo"))
-        self.assertEquals(e.kind, NODE_FILE)
-        self.assertEquals(e.revision, 0)
+        self.assertEqual(e.kind, NODE_FILE)
+        self.assertEqual(e.revision, 0)
 
     def test_get_config(self):
         self.assertIsInstance(client.get_config(), client.Config)
@@ -140,9 +140,9 @@
             return # Skip test
 
         (outf, errf) = self.client.diff(1, 2, self.repos_url, self.repos_url)
-        outf.seek(0)
-        errf.seek(0)
-        self.assertEquals("""Index: foo
+        self.addCleanup(outf.close)
+        self.addCleanup(errf.close)
+        self.assertEqual(b"""Index: foo
 ===================================================================
 --- foo\t(revision 1)
 +++ foo\t(revision 2)
@@ -151,13 +151,13 @@
 \\ No newline at end of file
 +foo2
 \\ No newline at end of file
-""", outf.read())
-        self.assertEquals("", errf.read())
+""".splitlines(), outf.read().splitlines())
+        self.assertEqual(b"", errf.read())
 
     def assertCatEquals(self, value, revision=None):
         io = StringIO()
         self.client.cat("dc/foo", io, revision)
-        self.assertEquals(value, io.getvalue())
+        self.assertEqual(value, io.getvalue())
 
     def test_cat(self):
         self.build_tree({"dc/foo": "bla"})
@@ -174,10 +174,10 @@
     def assertLogEntryChangedPathsEquals(self, expected, entry):
         changed_paths = entry["changed_paths"]
         self.assertIsInstance(changed_paths, dict)
-        self.assertEquals(sorted(expected), sorted(changed_paths.keys()))
+        self.assertEqual(sorted(expected), sorted(changed_paths.keys()))
 
     def assertLogEntryMessageEquals(self, expected, entry):
-        self.assertEquals(expected, entry["revprops"]["svn:log"])
+        self.assertEqual(expected, entry["revprops"]["svn:log"])
 
     def assertLogEntryDateAlmostEquals(self, expected, entry, delta):
         actual = datetime.strptime(entry["revprops"]["svn:date"], "%Y-%m-%dT%H:%M:%S.%fZ")
@@ -201,9 +201,9 @@
         self.client.commit(["dc"])
         commit_1_dt = datetime.utcnow()
         self.client.log(cb, "dc/foo")
-        self.assertEquals(1, len(log_entries))
-        self.assertEquals(None, log_entries[0]["changed_paths"])
-        self.assertEquals(1, log_entries[0]["revision"])
+        self.assertEqual(1, len(log_entries))
+        self.assertEqual(None, log_entries[0]["changed_paths"])
+        self.assertEqual(1, log_entries[0]["revision"])
         self.assertLogEntryMessageEquals(commit_msg_1, log_entries[0])
         self.assertLogEntryDateAlmostEquals(commit_1_dt, log_entries[0], delta)
         self.build_tree({
@@ -216,20 +216,20 @@
         commit_2_dt = datetime.utcnow()
         log_entries = []
         self.client.log(cb, "dc/foo", discover_changed_paths=True)
-        self.assertEquals(2, len(log_entries))
+        self.assertEqual(2, len(log_entries))
         self.assertLogEntryChangedPathsEquals(["/foo", "/bar"], log_entries[0])
-        self.assertEquals(2, log_entries[0]["revision"])
+        self.assertEqual(2, log_entries[0]["revision"])
         self.assertLogEntryMessageEquals(commit_msg_2, log_entries[0])
         self.assertLogEntryDateAlmostEquals(commit_2_dt, log_entries[0], delta)
         self.assertLogEntryChangedPathsEquals(["/foo"], log_entries[1])
-        self.assertEquals(1, log_entries[1]["revision"])
+        self.assertEqual(1, log_entries[1]["revision"])
         self.assertLogEntryMessageEquals(commit_msg_1, log_entries[1])
         self.assertLogEntryDateAlmostEquals(commit_1_dt, log_entries[1], delta)
         log_entries = []
         self.client.log(cb, "dc/foo", start_rev=2, end_rev=2, discover_changed_paths=True)
-        self.assertEquals(1, len(log_entries))
+        self.assertEqual(1, len(log_entries))
         self.assertLogEntryChangedPathsEquals(["/foo", "/bar"], log_entries[0])
-        self.assertEquals(2, log_entries[0]["revision"])
+        self.assertEqual(2, log_entries[0]["revision"])
         self.assertLogEntryMessageEquals(commit_msg_2, log_entries[0])
         self.assertLogEntryDateAlmostEquals(commit_2_dt, log_entries[0], delta)
 
@@ -239,16 +239,16 @@
         self.client.log_msg_func = lambda c: "Commit"
         self.client.commit(["dc"])
         info = self.client.info("dc/foo")
-        self.assertEquals(["dc/foo"], info.keys())
-        self.assertEquals(1, info["dc/foo"].revision)
+        self.assertEqual(["dc/foo"], sorted(info.keys()))
+        self.assertEqual(1, info["dc/foo"].revision)
         self.assertIs(None, info["dc/foo"].size)
-        self.assertEquals(wc.SCHEDULE_NORMAL, info["dc/foo"].wc_info.schedule)
+        self.assertEqual(wc.SCHEDULE_NORMAL, info["dc/foo"].wc_info.schedule)
         self.build_tree({"dc/bar": "blablabla"})
         self.client.add("dc/bar")
         info = self.client.info("dc/bar")
-        self.assertEquals(["dc/bar"], info.keys())
-        self.assertEquals(0, info["dc/bar"].revision)
-        self.assertEquals(wc.SCHEDULE_ADD, info["dc/bar"].wc_info.schedule)
+        self.assertEqual(["dc/bar"], sorted(info.keys()))
+        self.assertEqual(0, info["dc/bar"].revision)
+        self.assertEqual(wc.SCHEDULE_ADD, info["dc/bar"].wc_info.schedule)
 
     def test_info_nonexistant(self):
         self.build_tree({"dc/foo": "bla"})

=== modified file 'subvertpy/tests/test_delta.py'
--- subvertpy/tests/test_delta.py	2011-02-19 20:33:38 +0000
+++ subvertpy/tests/test_delta.py	2012-04-07 06:08:21 +0000
@@ -15,7 +15,7 @@
 
 """Tests for subvertpy.delta."""
 
-from cStringIO import StringIO
+from io import StringIO
 
 from subvertpy.delta import (
     decode_length,
@@ -38,19 +38,19 @@
     def test_send_stream(self):
         stream = StringIO("foo")
         send_stream(stream, self.storing_window_handler)
-        self.assertEquals([(0, 0, 3, 0, [(2, 0, 3)], 'foo'), None], 
+        self.assertEqual([(0, 0, 3, 0, [(2, 0, 3)], b'foo'), None], 
                           self.windows)
 
 
 class MarshallTests(TestCase):
 
     def test_encode_length(self):
-        self.assertEquals("\x81\x02", encode_length(130))
+        self.assertEqual("\x81\x02", encode_length(130))
 
     def test_roundtrip_length(self):
-        self.assertEquals((42, ""), decode_length(encode_length(42)))
+        self.assertEqual((42, ""), decode_length(encode_length(42)))
 
 
     def test_roundtrip_window(self):
         mywindow = (0, 0, 3, 1, [(2, 0, 3)], 'foo')
-        self.assertEquals([mywindow], list(unpack_svndiff0(pack_svndiff0([mywindow]))))
+        self.assertEqual([mywindow], list(unpack_svndiff0(pack_svndiff0([mywindow]))))

=== modified file 'subvertpy/tests/test_properties.py'
--- subvertpy/tests/test_properties.py	2012-03-11 03:45:45 +0000
+++ subvertpy/tests/test_properties.py	2012-04-07 06:08:21 +0000
@@ -29,7 +29,7 @@
         super(TestProperties, self).setUp()
 
     def test_time_from_cstring(self):
-        self.assertEquals(1225704780716938L, properties.time_from_cstring("2008-11-03T09:33:00.716938Z"))
+        self.assertEqual(1225704780716938, properties.time_from_cstring("2008-11-03T09:33:00.716938Z"))
 
     def test_time_from_cstring_independent_from_dst(self):
         old_tz = os.environ.get('TZ', None)
@@ -42,7 +42,7 @@
             os.environ['TZ'] = 'Europe/London'
             time.tzset()
             # Now test a time within that DST
-            self.assertEquals(1275295762430000L, properties.time_from_cstring("2010-05-31T08:49:22.430000Z"))
+            self.assertEqual(1275295762430000, properties.time_from_cstring("2010-05-31T08:49:22.430000Z"))
         finally:
             if old_tz is None:
                 del os.environ['TZ']
@@ -51,7 +51,7 @@
             time.tzset()
 
     def test_time_to_cstring(self):
-        self.assertEquals("2008-11-03T09:33:00.716938Z", properties.time_to_cstring(1225704780716938L))
+        self.assertEqual("2008-11-03T09:33:00.716938Z", properties.time_to_cstring(1225704780716938))
 
 
 class TestExternalsParser(TestCase):
@@ -123,47 +123,47 @@
 
 class MergeInfoPropertyParserTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals({"/trunk": [(1, 2, True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
+        self.assertEqual({"/trunk": [(1, 2, True)]}, properties.parse_mergeinfo_property("/trunk:1-2\n"))
 
     def test_simple_range_uninheritable(self):
-        self.assertEquals({"/trunk": [(1, 2, False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
+        self.assertEqual({"/trunk": [(1, 2, False)]}, properties.parse_mergeinfo_property("/trunk:1-2*\n"))
 
     def test_simple_individual(self):
-        self.assertEquals({"/trunk": [(1, 1, True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
+        self.assertEqual({"/trunk": [(1, 1, True)]}, properties.parse_mergeinfo_property("/trunk:1\n"))
 
     def test_empty(self):
-        self.assertEquals({}, properties.parse_mergeinfo_property(""))
+        self.assertEqual({}, properties.parse_mergeinfo_property(""))
        
 
 class MergeInfoPropertyCreatorTests(TestCase):
     def test_simple_range(self):
-        self.assertEquals("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1, 2, True)]}))
+        self.assertEqual("/trunk:1-2\n", properties.generate_mergeinfo_property({"/trunk": [(1, 2, True)]}))
 
     def test_simple_individual(self):
-        self.assertEquals("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1, 1, True)]}))
+        self.assertEqual("/trunk:1\n", properties.generate_mergeinfo_property({"/trunk": [(1, 1, True)]}))
 
     def test_empty(self):
-        self.assertEquals("", properties.generate_mergeinfo_property({}))
+        self.assertEqual("", properties.generate_mergeinfo_property({}))
 
 
 class RevnumRangeTests(TestCase):
     def test_add_revnum_empty(self):
-        self.assertEquals([(1, 1, True)], properties.range_add_revnum([], 1))
+        self.assertEqual([(1, 1, True)], properties.range_add_revnum([], 1))
 
     def test_add_revnum_before(self):
-        self.assertEquals([(2, 2, True), (8, 8, True)], properties.range_add_revnum([(2, 2, True)], 8))
+        self.assertEqual([(2, 2, True), (8, 8, True)], properties.range_add_revnum([(2, 2, True)], 8))
 
     def test_add_revnum_included(self):
-        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 3, True)], 2))
+        self.assertEqual([(1, 3, True)], properties.range_add_revnum([(1, 3, True)], 2))
         
     def test_add_revnum_after(self):
-        self.assertEquals([(1, 3, True), (5, 5, True)], properties.range_add_revnum([(1, 3, True)], 5))
+        self.assertEqual([(1, 3, True), (5, 5, True)], properties.range_add_revnum([(1, 3, True)], 5))
 
     def test_add_revnum_extend_before(self):
-        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(2, 3, True)], 1))
+        self.assertEqual([(1, 3, True)], properties.range_add_revnum([(2, 3, True)], 1))
 
     def test_add_revnum_extend_after(self):
-        self.assertEquals([(1, 3, True)], properties.range_add_revnum([(1, 2, True)], 3))
+        self.assertEqual([(1, 3, True)], properties.range_add_revnum([(1, 2, True)], 3))
 
     def test_revnum_includes_empty(self):
         self.assertFalse(properties.range_includes_revnum([], 2))

=== modified file 'subvertpy/tests/test_ra.py'
--- subvertpy/tests/test_ra.py	2011-11-08 14:41:55 +0000
+++ subvertpy/tests/test_ra.py	2012-04-07 06:08:21 +0000
@@ -15,7 +15,7 @@
 
 """Subversion ra library tests."""
 
-from cStringIO import StringIO
+from io import StringIO
 
 from subvertpy import (
     NODE_DIR, NODE_NONE, NODE_UNKNOWN,
@@ -30,10 +30,10 @@
 class VersionTest(TestCase):
 
     def test_version_length(self):
-        self.assertEquals(4, len(ra.version()))
+        self.assertEqual(4, len(ra.version()))
 
     def test_api_version_length(self):
-        self.assertEquals(4, len(ra.api_version()))
+        self.assertEqual(4, len(ra.api_version()))
 
     def test_api_version_later_same(self):
         self.assertTrue(ra.api_version() <= ra.version())
@@ -66,15 +66,15 @@
         dc.close()
 
     def test_repr(self):
-        self.assertEquals("RemoteAccess(\"%s\")" % self.repos_url,
+        self.assertEqual("RemoteAccess(\"%s\")" % self.repos_url,
                           repr(self.ra))
 
     def test_latest_revnum(self):
-        self.assertEquals(0, self.ra.get_latest_revnum())
+        self.assertEqual(0, self.ra.get_latest_revnum())
 
     def test_latest_revnum_one(self):
         self.do_commit()
-        self.assertEquals(1, self.ra.get_latest_revnum())
+        self.assertEqual(1, self.ra.get_latest_revnum())
 
     def test_get_uuid(self):
         self.assertIsInstance(self.ra.get_uuid(), str)
@@ -109,8 +109,8 @@
         self.do_commit()
         (dirents, fetch_rev, props) = self.ra.get_dir("/", 1, fields=ra.DIRENT_KIND)
         self.assertIsInstance(props, dict)
-        self.assertEquals(1, fetch_rev)
-        self.assertEquals(NODE_DIR, dirents["foo"]["kind"])
+        self.assertEqual(1, fetch_rev)
+        self.assertEqual(NODE_DIR, dirents["foo"]["kind"])
 
     def test_change_rev_prop(self):
         self.do_commit()
@@ -151,29 +151,29 @@
 
     def test_iter_log(self):
         def check_results(returned):
-            self.assertEquals(2, len(returned))
-            self.assert_(len(returned[0]) in (3,4))
+            self.assertEqual(2, len(returned))
+            self.assertTrue(len(returned[0]) in (3,4))
             if len(returned[0]) == 3:
                 (paths, revnum, props) = returned[0]
             else:
                 (paths, revnum, props, has_children) = returned[0]
-            self.assertEquals(None, paths)
-            self.assertEquals(revnum, 0)
-            self.assertEquals(["svn:date"], props.keys())
+            self.assertEqual(None, paths)
+            self.assertEqual(revnum, 0)
+            self.assertEqual(["svn:date"], list(props.keys()))
             if len(returned[1]) == 3:
                 (paths, revnum, props) = returned[1]
             else:
                 (paths, revnum, props, has_children) = returned[1]
             if ra.api_version() < (1, 6):
-                self.assertEquals({'/foo': ('A', None, -1, NODE_UNKNOWN)}, paths)
+                self.assertEqual({'/foo': (b'A', None, -1, NODE_UNKNOWN)}, paths)
             else:
-                self.assertEquals({'/foo': ('A', None, -1, NODE_DIR)}, paths)
-            self.assertEquals(revnum, 1)
-            self.assertEquals(set(["svn:date", "svn:author", "svn:log"]), 
+                self.assertEqual({'/foo': (b'A', None, -1, NODE_DIR)}, paths)
+            self.assertEqual(revnum, 1)
+            self.assertEqual(set(["svn:date", "svn:author", "svn:log"]), 
                               set(props.keys()))
         returned = list(self.ra.iter_log([""], 0, 0,
             revprops=["svn:date", "svn:author", "svn:log"]))
-        self.assertEquals(1, len(returned))
+        self.assertEqual(1, len(returned))
         self.do_commit()
         returned = list(self.ra.iter_log(None, 0, 1, discover_changed_paths=True, 
             strict_node_history=False, revprops=["svn:date", "svn:author", "svn:log"]))
@@ -184,25 +184,25 @@
         def cb(*args):
             returned.append(args)
         def check_results(returned):
-            self.assertEquals(2, len(returned))
-            self.assert_(len(returned[0]) in (3,4))
+            self.assertEqual(2, len(returned))
+            self.assertTrue(len(returned[0]) in (3,4))
             if len(returned[0]) == 3:
                 (paths, revnum, props) = returned[0]
             else:
                 (paths, revnum, props, has_children) = returned[0]
-            self.assertEquals(None, paths)
-            self.assertEquals(revnum, 0)
-            self.assertEquals(["svn:date"], props.keys())
+            self.assertEqual(None, paths)
+            self.assertEqual(revnum, 0)
+            self.assertEqual(["svn:date"], list(props.keys()))
             if len(returned[1]) == 3:
                 (paths, revnum, props) = returned[1]
             else:
                 (paths, revnum, props, has_children) = returned[1]
-            self.assertEquals({'/foo': ('A', None, -1)}, paths)
-            self.assertEquals(revnum, 1)
-            self.assertEquals(set(["svn:date", "svn:author", "svn:log"]), 
+            self.assertEqual({'/foo': (b'A', None, -1)}, paths)
+            self.assertEqual(revnum, 1)
+            self.assertEqual(set(["svn:date", "svn:author", "svn:log"]), 
                               set(props.keys()))
         self.ra.get_log(cb, [""], 0, 0, revprops=["svn:date", "svn:author", "svn:log"])
-        self.assertEquals(1, len(returned))
+        self.assertEqual(1, len(returned))
         self.do_commit()
         returned = []
         self.ra.get_log(cb, None, 0, 1, discover_changed_paths=True, 
@@ -254,7 +254,7 @@
         root.close()
         editor.close()
 
-        self.assertEquals(set(['bar:foo', 'svn:author', 'svn:custom:blie', 'svn:date', 'svn:log']), set(self.ra.rev_proplist(1).keys()))
+        self.assertEqual(set(['bar:foo', 'svn:author', 'svn:custom:blie', 'svn:date', 'svn:log']), set(self.ra.rev_proplist(1).keys()))
 
     def test_get_commit_editor_context_manager(self):
         def mycb(paths, rev, revprops):
@@ -292,7 +292,7 @@
 
         stream = StringIO()
         props = self.ra.get_file("bar", stream, 1)[1]
-        self.assertEquals("blie", props.get("bla:bar"))
+        self.assertEqual("blie", props.get("bla:bar"))
         stream = StringIO()
         props = self.ra.get_file("bar", stream, 2)[1]
         self.assertIs(None, props.get("bla:bar"))
@@ -315,11 +315,11 @@
 
         self.ra.get_file_revs("bar", 1, 2, handle)
 
-        self.assertEquals(2, len(rets))
-        self.assertEquals(1, rets[0][1])
-        self.assertEquals(2, rets[1][1])
-        self.assertEquals("/bar", rets[0][0])
-        self.assertEquals("/bar", rets[1][0])
+        self.assertEqual(2, len(rets))
+        self.assertEqual(1, rets[0][1])
+        self.assertEqual(2, rets[1][1])
+        self.assertEqual("/bar", rets[0][0])
+        self.assertEqual("/bar", rets[1][0])
 
     def test_get_file(self):
         cb = self.commit_editor()
@@ -329,24 +329,24 @@
         stream = StringIO()
         self.ra.get_file("bar", stream, 1)
         stream.seek(0)
-        self.assertEquals("a", stream.read())
+        self.assertEqual("a", stream.read())
 
         stream = StringIO()
         self.ra.get_file("/bar", stream, 1)
         stream.seek(0)
-        self.assertEquals("a", stream.read())
+        self.assertEqual("a", stream.read())
 
     def test_get_locations_root(self):
-        self.assertEquals({0: "/"}, self.ra.get_locations("", 0, [0]))
+        self.assertEqual({0: "/"}, self.ra.get_locations("", 0, [0]))
 
     def test_check_path(self):
         cb = self.commit_editor()
         cb.add_dir("bar")
         cb.close()
 
-        self.assertEquals(NODE_DIR, self.ra.check_path("bar", 1))
-        self.assertEquals(NODE_DIR, self.ra.check_path("bar/", 1))
-        self.assertEquals(NODE_NONE, self.ra.check_path("blaaaa", 1))
+        self.assertEqual(NODE_DIR, self.ra.check_path("bar", 1))
+        self.assertEqual(NODE_DIR, self.ra.check_path("bar/", 1))
+        self.assertEqual(NODE_NONE, self.ra.check_path("blaaaa", 1))
 
     def test_check_path_with_unsafe_path(self):
         # The SVN code asserts that paths do not have a leading '/'... And if
@@ -361,7 +361,7 @@
         cb.close()
 
         ret = self.ra.stat("bar", 1)
-        self.assertEquals(set(['last_author', 'kind', 'created_rev', 'has_props', 'time', 'size']), set(ret.keys()))
+        self.assertEqual(set(['last_author', 'kind', 'created_rev', 'has_props', 'time', 'size']), set(ret.keys()))
 
     def test_get_locations_dir(self):
         cb = self.commit_editor()
@@ -376,16 +376,16 @@
         cb.delete("bar")
         cb.close()
 
-        self.assertEquals({1: "/bar", 2: "/bla"}, 
+        self.assertEqual({1: "/bar", 2: "/bla"}, 
                           self.ra.get_locations("bla", 2, [1,2]))
 
-        self.assertEquals({1: "/bar", 2: "/bar"}, 
+        self.assertEqual({1: "/bar", 2: "/bar"}, 
                           self.ra.get_locations("bar", 1, [1,2]))
 
-        self.assertEquals({1: "/bar", 2: "/bar"}, 
+        self.assertEqual({1: "/bar", 2: "/bar"}, 
                           self.ra.get_locations("bar", 2, [1,2]))
 
-        self.assertEquals({1: "/bar", 2: "/bla", 3: "/bla"}, 
+        self.assertEqual({1: "/bar", 2: "/bla", 3: "/bla"}, 
                           self.ra.get_locations("bla", 3, [1,2,3]))
 
     def test_get_locations_dir_with_unsafe_path(self):
@@ -405,33 +405,33 @@
     def test_simple(self):
         auth = ra.Auth([ra.get_simple_prompt_provider(lambda realm, uname, may_save: ("foo", "geheim", False), 0)])
         creds = auth.credentials("svn.simple", "MyRealm")
-        self.assertEquals(("foo", "geheim", 0), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual(("foo", "geheim", 0), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_username(self):
         auth = ra.Auth([ra.get_username_prompt_provider(lambda realm, may_save: ("somebody", False), 0)])
         creds = auth.credentials("svn.username", "MyRealm")
-        self.assertEquals(("somebody", 0), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual(("somebody", 0), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_client_cert(self):
         auth = ra.Auth([ra.get_ssl_client_cert_prompt_provider(lambda realm, may_save: ("filename", False), 0)])
         creds = auth.credentials("svn.ssl.client-cert", "MyRealm")
-        self.assertEquals(("filename", False), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual(("filename", False), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_client_cert_pw(self):
         auth = ra.Auth([ra.get_ssl_client_cert_pw_prompt_provider(lambda realm, may_save: ("supergeheim", False), 0)])
         creds = auth.credentials("svn.ssl.client-passphrase", "MyRealm")
-        self.assertEquals(("supergeheim", False), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual(("supergeheim", False), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_server_trust(self):
         auth = ra.Auth([ra.get_ssl_server_trust_prompt_provider(lambda realm, failures, certinfo, may_save: (42, False))])
         auth.set_parameter("svn:auth:ssl:failures", 23)
         creds = auth.credentials("svn.ssl.server", "MyRealm")
-        self.assertEquals((42, 0), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual((42, 0), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_retry(self):
         self.i = 0
@@ -440,20 +440,20 @@
             return ("somebody%d" % self.i, False)
         auth = ra.Auth([ra.get_username_prompt_provider(inc_foo, 2)])
         creds = auth.credentials("svn.username", "MyRealm")
-        self.assertEquals(("somebody1", 0), creds.next())
-        self.assertEquals(("somebody2", 0), creds.next())
-        self.assertEquals(("somebody3", 0), creds.next())
-        self.assertRaises(StopIteration, creds.next)
+        self.assertEqual(("somebody1", 0), next(creds))
+        self.assertEqual(("somebody2", 0), next(creds))
+        self.assertEqual(("somebody3", 0), next(creds))
+        self.assertRaises(StopIteration, creds.__next__)
 
     def test_set_default_username(self):
         a = ra.Auth([])
         a.set_parameter("svn:auth:username", "foo")
-        self.assertEquals("foo", a.get_parameter("svn:auth:username"))
+        self.assertEqual("foo", a.get_parameter("svn:auth:username"))
 
     def test_set_default_password(self):
         a = ra.Auth([])
         a.set_parameter("svn:auth:password", "bar")
-        self.assertEquals("bar", a.get_parameter("svn:auth:password"))
+        self.assertEqual("bar", a.get_parameter("svn:auth:password"))
 
     def test_platform_auth_providers(self):
         ra.Auth(ra.get_platform_specific_client_providers())

=== modified file 'subvertpy/tests/test_repos.py'
--- subvertpy/tests/test_repos.py	2011-09-13 11:15:18 +0000
+++ subvertpy/tests/test_repos.py	2012-04-07 06:08:21 +0000
@@ -15,7 +15,7 @@
 
 """Subversion repository library tests."""
 
-from cStringIO import StringIO
+from io import StringIO
 import os
 import textwrap
 
@@ -26,10 +26,10 @@
 class VersionTest(TestCase):
 
     def test_version_length(self):
-        self.assertEquals(4, len(repos.version()))
+        self.assertEqual(4, len(repos.version()))
 
     def test_api_version_length(self):
-        self.assertEquals(4, len(repos.api_version()))
+        self.assertEqual(4, len(repos.api_version()))
 
     def test_api_version_later_same(self):
         self.assertTrue(repos.api_version() <= repos.version())
@@ -54,7 +54,7 @@
         r = repos.create(os.path.join(self.test_dir, "foo"))
         f = StringIO()
         r.verify_fs(f, 0, 0)
-        self.assertEquals('* Verified revision 0.\n', f.getvalue())
+        self.assertEqual('* Verified revision 0.\n', f.getvalue())
 
     def test_open(self):
         repos.create(os.path.join(self.test_dir, "foo"))
@@ -66,7 +66,7 @@
 
     def test_youngest_rev(self):
         repos.create(os.path.join(self.test_dir, "foo"))
-        self.assertEquals(0, repos.Repository("foo").fs().youngest_revision())
+        self.assertEqual(0, repos.Repository("foo").fs().youngest_revision())
 
     def test_rev_root(self):
         repos.create(os.path.join(self.test_dir, "foo"))
@@ -98,11 +98,11 @@
         """)
         feedback = StringIO()
         r.load_fs(StringIO(dumpfile), feedback, repos.LOAD_UUID_DEFAULT)
-        self.assertEquals(r.fs().get_uuid(), "38f0a982-fd1f-4e00-aa6b-a20720f4b9ca")
+        self.assertEqual(r.fs().get_uuid(), "38f0a982-fd1f-4e00-aa6b-a20720f4b9ca")
 
     def test_rev_props(self):
         repos.create(os.path.join(self.test_dir, "foo"))
-        self.assertEquals(["svn:date"], repos.Repository("foo").fs().revision_proplist(0).keys())
+        self.assertEqual(["svn:date"], list(repos.Repository("foo").fs().revision_proplist(0).keys()))
 
     def test_rev_root_invalid(self):
         repos.create(os.path.join(self.test_dir, "foo"))
@@ -115,19 +115,19 @@
     def test_paths_changed(self):
         repos.create(os.path.join(self.test_dir, "foo"))
         root = repos.Repository("foo").fs().revision_root(0)
-        self.assertEquals({}, root.paths_changed())
+        self.assertEqual({}, root.paths_changed())
 
     def test_is_dir(self):
         repos.create(os.path.join(self.test_dir, "foo"))
         root = repos.Repository("foo").fs().revision_root(0)
-        self.assertEquals(True, root.is_dir(""))
-        self.assertEquals(False, root.is_dir("nonexistant"))
+        self.assertEqual(True, root.is_dir(""))
+        self.assertEqual(False, root.is_dir("nonexistant"))
 
     def test_is_file(self):
         repos.create(os.path.join(self.test_dir, "foo"))
         root = repos.Repository("foo").fs().revision_root(0)
-        self.assertEquals(False, root.is_file(""))
-        self.assertEquals(False, root.is_file("nonexistant"))
+        self.assertEqual(False, root.is_file(""))
+        self.assertEqual(False, root.is_file("nonexistant"))
 
 
 class StreamTests(TestCase):
@@ -137,12 +137,12 @@
         if repos.api_version() < (1, 6):
             self.assertRaises(NotImplementedError, s.read)
         else:
-            self.assertEquals("", s.read())
-            self.assertEquals("", s.read(15))
+            self.assertEqual(b"", s.read())
+            self.assertEqual(b"", s.read(15))
             s.close()
 
     def test_write(self):
         s = repos.Stream()
-        self.assertEquals(0, s.write(""))
-        self.assertEquals(2, s.write("ab"))
+        self.assertEqual(0, s.write(""))
+        self.assertEqual(2, s.write("ab"))
         s.close()

=== modified file 'subvertpy/tests/test_wc.py'
--- subvertpy/tests/test_wc.py	2011-12-13 19:14:03 +0000
+++ subvertpy/tests/test_wc.py	2012-04-07 06:08:21 +0000
@@ -15,7 +15,7 @@
 
 """Subversion ra library tests."""
 
-from StringIO import StringIO
+from io import StringIO
 import os
 
 import subvertpy
@@ -32,10 +32,10 @@
 class VersionTest(TestCase):
 
     def test_version_length(self):
-        self.assertEquals(4, len(wc.version()))
+        self.assertEqual(4, len(wc.version()))
 
     def test_api_version_length(self):
-        self.assertEquals(4, len(wc.api_version()))
+        self.assertEqual(4, len(wc.api_version()))
 
     def test_api_version_later_same(self):
         self.assertTrue(wc.api_version() <= wc.version())
@@ -44,13 +44,13 @@
 class WorkingCopyTests(TestCase):
 
     def test_get_adm_dir(self):
-        self.assertEquals(".svn", wc.get_adm_dir())
+        self.assertEqual(".svn", wc.get_adm_dir())
 
     def test_set_adm_dir(self):
         old_dir_name = wc.get_adm_dir()
         try:
             wc.set_adm_dir("_svn")
-            self.assertEquals("_svn", wc.get_adm_dir())
+            self.assertEqual("_svn", wc.get_adm_dir())
         finally:
             wc.set_adm_dir(old_dir_name)
 
@@ -78,12 +78,12 @@
     def test_revision_status(self):
         repos_url = self.make_client("repos", "checkout")
         ret = wc.revision_status("checkout")
-        self.assertEquals((0, 0, 0, 0), ret)
+        self.assertEqual((0, 0, 0, 0), ret)
 
     def test_revision_status_trailing(self):
         repos_url = self.make_client("repos", "checkout")
         ret = wc.revision_status("checkout/")
-        self.assertEquals((0, 0, 0, 0), ret)
+        self.assertEqual((0, 0, 0, 0), ret)
 
 
 class AdmTests(SubversionTestCase):
@@ -103,7 +103,7 @@
         self.client_add('checkout/bar')
         adm = wc.WorkingCopy(None, "checkout")
         path = os.path.join(self.test_dir, "checkout/bar")
-        self.assertEquals(("%s/bar" % repos_url, 0), adm.get_ancestry("checkout/bar"))
+        self.assertEqual(("%s/bar" % repos_url, 0), adm.get_ancestry("checkout/bar"))
         adm.close()
 
     def test_maybe_set_repos_root(self):
@@ -116,7 +116,7 @@
         repos_url = self.make_client("repos", "checkout")
         adm = wc.WorkingCopy(None, "checkout", True)
         adm.add_repos_file("checkout/bar", StringIO("basecontents"), StringIO("contents"), {}, {})
-        self.assertEquals("basecontents", wc.get_pristine_contents("checkout/bar").read())
+        self.assertEqual(b"basecontents", wc.get_pristine_contents("checkout/bar").read())
 
     def test_mark_missing_deleted(self):
         repos_url = self.make_client("repos", "checkout")
@@ -149,7 +149,7 @@
         adm = wc.WorkingCopy(None, "checkout", True)
         path = os.path.join(self.test_dir, "checkout/bar")
         stream = adm.translated_stream(path, path, wc.TRANSLATE_TO_NF)
-        self.assertTrue(stream.read().startswith("My id: $Id: "))
+        self.assertTrue(stream.read().startswith(b"My id: $Id: "))
 
     def test_text_modified(self):
         repos_url = self.make_client("repos", "checkout")
@@ -179,9 +179,9 @@
         self.client_add('checkout/bar')
         adm = wc.WorkingCopy(None, "checkout", True)
         adm.prop_set("aprop", "avalue", "checkout/bar")
-        self.assertEquals(adm.prop_get("aprop", "checkout/bar"), "avalue")
+        self.assertEqual(adm.prop_get("aprop", "checkout/bar"), "avalue")
         adm.prop_set("aprop", None, "checkout/bar")
-        self.assertEquals(adm.prop_get("aprop", "checkout/bar"), None)
+        self.assertEqual(adm.prop_get("aprop", "checkout/bar"), None)
 
     def test_committed_queue(self):
         if getattr(wc, "CommittedQueue", None) is None:
@@ -202,19 +202,19 @@
         self.client_add('checkout/bar')
         adm = wc.WorkingCopy(None, "checkout")
         entry = adm.entry("checkout/bar")
-        self.assertEquals("bar", entry.name)
-        self.assertEquals(NODE_FILE, entry.kind)
-        self.assertEquals(0, entry.revision)
+        self.assertEqual("bar", entry.name)
+        self.assertEqual(NODE_FILE, entry.kind)
+        self.assertEqual(0, entry.revision)
         self.client_commit("checkout", "msg")
         adm = wc.WorkingCopy(None, "checkout")
         entry = adm.entry("checkout/bar")
-        self.assertEquals("bar", entry.name)
-        self.assertEquals(NODE_FILE, entry.kind)
-        self.assertEquals(1, entry.revision)
+        self.assertEqual("bar", entry.name)
+        self.assertEqual(NODE_FILE, entry.kind)
+        self.assertEqual(1, entry.revision)
 
     def test_get_actual_target(self):
         repos_url = self.make_client("repos", ".")
-        self.assertEquals((self.test_dir, "bla"),
+        self.assertEqual((self.test_dir, "bla"),
             wc.get_actual_target("%s/bla" % self.test_dir))
 
     def test_is_wc_root(self):
@@ -230,10 +230,10 @@
         self.build_tree({"checkout/bar": "text"})
         self.client_add('checkout/bar')
         adm = wc.WorkingCopy(None, "checkout")
-        self.assertEquals(wc.STATUS_ADDED, adm.status('bar').status)
+        self.assertEqual(wc.STATUS_ADDED, adm.status('bar').status)
         self.client_commit("checkout", "foo")
         adm = wc.WorkingCopy(None, "checkout")
-        self.assertEquals(wc.STATUS_NORMAL, adm.status('bar').status)
+        self.assertEqual(wc.STATUS_NORMAL, adm.status('bar').status)
 
     def test_transmit_text_deltas(self):
         repos_url = self.make_client("repos", ".")
@@ -255,24 +255,24 @@
                 pass
         editor = Editor()
         (tmpfile, digest) = adm.transmit_text_deltas("bar", True, editor)
-        self.assertEquals(editor._windows, [(0L, 0, 5, 0, [(2, 0, 5)], 'blala'), None])
+        self.assertEqual(editor._windows, [(0, 0, 5, 0, [(2, 0, 5)], b'blala'), None])
         self.assertIsInstance(tmpfile, str)
-        self.assertEquals(16, len(digest))
+        self.assertEqual(16, len(digest))
 
         bar = adm.entry("bar")
-        self.assertEquals(-1, bar.cmt_rev)
-        self.assertEquals(0, bar.revision)
+        self.assertEqual(-1, bar.cmt_rev)
+        self.assertEqual(0, bar.revision)
 
         cq = wc.CommittedQueue()
         cq.queue("bar", adm)
         adm.process_committed_queue(cq, 1, "2010-05-31T08:49:22.430000Z", "jelmer")
         bar = adm.entry("bar")
-        self.assertEquals("bar", bar.name)
-        self.assertEquals(NODE_FILE, bar.kind)
-        self.assertEquals(wc.SCHEDULE_NORMAL, bar.schedule)
+        self.assertEqual("bar", bar.name)
+        self.assertEqual(NODE_FILE, bar.kind)
+        self.assertEqual(wc.SCHEDULE_NORMAL, bar.schedule)
         self.assertIs(None, bar.checksum)
-        self.assertEquals(1, bar.cmt_rev)
-        self.assertEquals(1, bar.revision)
+        self.assertEqual(1, bar.cmt_rev)
+        self.assertEqual(1, bar.revision)
 
     def test_process_committed_queue(self):
         repos_url = self.make_client("repos", "checkout")
@@ -283,9 +283,9 @@
         cq.queue(os.path.join(self.test_dir, "checkout/bar"), adm)
         adm.process_committed_queue(cq, 1, "2010-05-31T08:49:22.430000Z", "jelmer")
         bar = adm.entry("checkout/bar")
-        self.assertEquals("bar", bar.name)
-        self.assertEquals(NODE_FILE, bar.kind)
-        self.assertEquals(wc.SCHEDULE_ADD, bar.schedule)
+        self.assertEqual("bar", bar.name)
+        self.assertEqual(NODE_FILE, bar.kind)
+        self.assertEqual(wc.SCHEDULE_ADD, bar.schedule)
 
     def test_probe_try(self):
         repos_url = self.make_client("repos", "checkout")
@@ -294,7 +294,20 @@
         adm = wc.WorkingCopy(None, "checkout", True)
         try:
             self.assertIs(None, adm.probe_try(self.test_dir))
-        except subvertpy.SubversionException, (msg, num):
-            if num != subvertpy.ERR_WC_NOT_WORKING_COPY:
+        except subvertpy.SubversionException:
+            _, e, _ = sys.exc_info()
+            if e.num != subvertpy.ERR_WC_NOT_WORKING_COPY:
                 raise
-        self.assertEquals("checkout", adm.probe_try(os.path.join("checkout", "bar")).access_path())
+        self.assertEqual("checkout", adm.probe_try(os.path.join("checkout", "bar")).access_path())
+
+    def test_walk_entries(self):
+        repos_url = self.make_client("repos", "checkout")
+        self.build_tree({"checkout/bar": "\x00\x01"})
+        self.client_add('checkout/bar')
+        adm = wc.WorkingCopy(None, "checkout")
+        paths = []
+        def callback(path, entry):
+            paths.append(path)
+        adm.walk_entries('checkout', callback)
+        self.assertEqual(['checkout', os.path.join('checkout', 'bar')],
+            paths)
\ No newline at end of file

=== modified file 'subvertpy/util.c'
--- subvertpy/util.c	2012-02-24 06:42:47 +0000
+++ subvertpy/util.c	2012-04-07 06:08:21 +0000
@@ -176,22 +176,32 @@
 	Py_DECREF(excobj);
 }
 
-PyObject *PyOS_tmpfile(void)
+PyObject *PyOS_tmpfile(apr_file_t** file, apr_pool_t* temp_pool)
 {
-	PyObject *osmodule, *tmpfile_fn, *ret;
+	PyObject *tempfile, *tmpfile_fn, *ret;
 
-	osmodule = PyImport_ImportModule("os");
-	if (osmodule == NULL)
+	tempfile = PyImport_ImportModule("tempfile");
+	if (tempfile == NULL)
 		return NULL;
 
-	tmpfile_fn = PyObject_GetAttrString(osmodule, "tmpfile");
-	Py_DECREF(osmodule);
+	tmpfile_fn = PyObject_GetAttrString(tempfile, "TemporaryFile");
+	Py_DECREF(tempfile);
 
 	if (tmpfile_fn == NULL)
 		return NULL;
 
 	ret = PyObject_CallObject(tmpfile_fn, NULL);
 	Py_DECREF(tmpfile_fn);
+	if (file == NULL || temp_pool == NULL)
+	{
+		return ret;
+	}
+	*file = apr_file_from_object(ret, temp_pool);
+	if (*file == NULL)
+	{
+		Py_DECREF(ret);
+		return NULL;
+	}
 	return ret;
 }
 
@@ -241,11 +251,11 @@
 	}
 	for (i = 0; i < PyList_GET_SIZE(l); i++) {
 		PyObject *item = PyList_GET_ITEM(l, i);
-		if (!PyString_Check(item)) {
+		if (!PyUnicode_Check(item)) {
 			PyErr_Format(PyExc_TypeError, "Expected list of strings, item was %s", item->ob_type->tp_name);
 			return false;
 		}
-		APR_ARRAY_PUSH(*ret, char *) = apr_pstrdup(pool, PyString_AsString(item));
+		APR_ARRAY_PUSH(*ret, char *) = apr_pstrdup(pool, _PyUnicode_AsString(item));
 	}
 	return true;
 }
@@ -257,18 +267,18 @@
 		*ret = NULL;
 		return true;
 	}
-	if (PyString_Check(l)) {
+	if (PyUnicode_Check(l)) {
 		*ret = apr_array_make(pool, 1, sizeof(char *));
-		APR_ARRAY_PUSH(*ret, const char *) = svn_path_canonicalize(PyString_AsString(l), pool);
+		APR_ARRAY_PUSH(*ret, const char *) = svn_path_canonicalize(_PyUnicode_AsString(l), pool);
 	} else if (PyList_Check(l)) {
 		*ret = apr_array_make(pool, PyList_Size(l), sizeof(char *));
 		for (i = 0; i < PyList_GET_SIZE(l); i++) {
 			PyObject *item = PyList_GET_ITEM(l, i);
-			if (!PyString_Check(item)) {
+			if (!PyUnicode_Check(item)) {
 				PyErr_Format(PyExc_TypeError, "Expected list of strings, item was %s", item->ob_type->tp_name);
 				return false;
 			}
-			APR_ARRAY_PUSH(*ret, const char *) = svn_path_canonicalize(PyString_AsString(item), pool);
+			APR_ARRAY_PUSH(*ret, const char *) = svn_path_canonicalize(_PyUnicode_AsString(item), pool);
 		}
 	} else {
 		PyErr_Format(PyExc_TypeError, "Expected list of strings, got: %s",
@@ -305,7 +315,7 @@
 			py_val = Py_None;
 			Py_INCREF(py_val);
 		} else {
-			py_val = PyString_FromStringAndSize(val->data, val->len);
+			py_val = PyUnicode_DecodeUTF8(val->data, val->len, NULL);
 		}
 		if (py_val == NULL) {
 			Py_DECREF(py_props);
@@ -316,7 +326,7 @@
 			py_key = Py_None;
 			Py_INCREF(py_key);
 		} else {
-			py_key = PyString_FromString(key);
+			py_key = PyUnicode_FromString(key);
 		}
 		if (PyDict_SetItem(py_props, py_key, py_val) != 0) {
 			Py_DECREF(py_key);
@@ -352,21 +362,21 @@
 
 	while (PyDict_Next(py_props, &idx, &k, &v)) {
 
-		if (!PyString_Check(k)) {
+		if (!PyUnicode_Check(k)) {
 			PyErr_SetString(PyExc_TypeError, 
 							"property name should be string");
 			return NULL;
 		}
-		if (!PyString_Check(v)) {
+		if (!PyUnicode_Check(v)) {
 			PyErr_SetString(PyExc_TypeError, 
 							"property value should be string");
 			return NULL;
 		}
 
-		val_string = svn_string_ncreate(PyString_AsString(v), 
-										PyString_Size(v), pool);
-		apr_hash_set(hash_props, PyString_AsString(k), 
-					 PyString_Size(k), val_string);
+		val_string = svn_string_ncreate(_PyUnicode_AsString(v), 
+										PyUnicode_GetSize(v), pool);
+		apr_hash_set(hash_props, _PyUnicode_AsString(k), 
+					 PyUnicode_GetSize(k), val_string);
 	}
 
 	return hash_props;
@@ -507,17 +517,17 @@
 	}
 	CB_CHECK_PYRETVAL(revprops);
 	if (message != NULL) {
-		obj = PyString_FromString(message);
+		obj = PyUnicode_FromString(message);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_LOG, obj);
 		Py_DECREF(obj);
 	}
 	if (author != NULL) {
-		obj = PyString_FromString(author);
+		obj = PyUnicode_FromString(author);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_AUTHOR, obj);
 		Py_DECREF(obj);
 	}
 	if (date != NULL) {
-		obj = PyString_FromString(date);
+		obj = PyUnicode_FromString(date);
 		PyDict_SetItemString(revprops, SVN_PROP_REVISION_DATE, obj);
 		Py_DECREF(obj);
 	}
@@ -562,7 +572,7 @@
 	}
 	for (i = 0; i < PyList_Size(l); i++) {
 		PyObject *item = PyList_GetItem(l, i);
-		long rev = PyInt_AsLong(item);
+		long rev = PyLong_AsLong(item);
 		if (rev == -1 && PyErr_Occurred()) {
 			return NULL;
 		}
@@ -580,13 +590,13 @@
 	ret = PyObject_CallMethod(self, "read", "i", *length);
 	CB_CHECK_PYRETVAL(ret);
 
-	if (!PyString_Check(ret)) {
+	if (!PyUnicode_Check(ret)) {
 		PyErr_SetString(PyExc_TypeError, "Expected stream read function to return string");
 		PyGILState_Release(state);
 		return py_svn_error();
 	}
-	*length = PyString_Size(ret);
-	memcpy(buffer, PyString_AS_STRING(ret), *length);
+	*length = PyUnicode_GetSize(ret);
+	memcpy(buffer, _PyUnicode_AsString(ret), *length);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
 	return NULL;
@@ -678,7 +688,7 @@
 	if (ret == NULL)
 		return NULL;
 	if (dirent_fields & SVN_DIRENT_KIND) {
-		obj = PyInt_FromLong(dirent->kind);
+		obj = PyLong_FromLong(dirent->kind);
 		PyDict_SetItemString(ret, "kind", obj);
 		Py_DECREF(obj);
 	}
@@ -704,7 +714,7 @@
 	}
 	if (dirent_fields & SVN_DIRENT_LAST_AUTHOR) {
 		if (dirent->last_author != NULL) {
-			obj = PyString_FromString(dirent->last_author);
+			obj = PyUnicode_FromString(dirent->last_author);
 		} else {
 			obj = Py_None;
 			Py_INCREF(obj);
@@ -717,26 +727,50 @@
 
 apr_file_t *apr_file_from_object(PyObject *object, apr_pool_t *pool)
 {
-    apr_status_t status;
-    FILE *file;
-    apr_file_t *fp;
-    apr_os_file_t osfile;
-  
-    file = PyFile_AsFile(object);
+	PyObject *filenameObject = NULL;
+	apr_file_t *fp = NULL;
+	apr_status_t status;
+	int fd = -1;
+	int is_filename = 0;
+	if (PyUnicode_Check(object)) {
+		is_filename = 1;
+		filenameObject = object;
+	}
+	else if ((fd = PyObject_AsFileDescriptor(object)) >= 0) {
 #ifdef WIN32
-    osfile = (apr_os_file_t)_get_osfhandle(_fileno(file));
+		/* apr_os_file_put is not works under Win32, so we directly retrieve
+		 * filename and open it. It's also works for _ra.py_open_tmp_file
+		 * under win32.*/
+		is_filename = 1;
+		filenameObject = PyObject_GetAttrString(object, "name");
 #else
-    osfile = (apr_os_file_t)fileno(file);
+		is_filename = 0;
 #endif
-
-    status = apr_os_file_put(&fp, &osfile,
-                             APR_FOPEN_WRITE | APR_FOPEN_CREATE, pool);
-    if (status) {
-        PyErr_SetAprStatus(status);
-        return NULL;
-    }
-
-    return fp;
+	}
+	else
+	{
+		PyErr_SetString(PyExc_TypeError, "Unknown type for file variable");
+		return NULL;
+	}
+
+	if (is_filename)
+	{
+		char *filename = _PyUnicode_AsString(filenameObject);
+		status = apr_file_open(&fp, filename,
+				APR_WRITE | APR_CREATE, APR_REG, pool);
+	}
+	else
+	{
+		apr_os_file_t osfile = (apr_os_file_t)fd;
+		status = apr_os_file_put(&fp, &osfile,
+				APR_FOPEN_WRITE | APR_FOPEN_CREATE, pool);
+	}
+	if (status) {
+		PyErr_SetAprStatus(status);
+		return NULL;
+	}
+
+	return fp;
 }
 
 static void stream_dealloc(PyObject *self)
@@ -795,7 +829,7 @@
 
 	RUN_SVN(svn_stream_write(self->stream, buffer, &length));
 
-	return PyInt_FromLong(length);
+	return PyLong_FromLong(length);
 }
 
 static PyObject *stream_read(StreamObject *self, PyObject *args)
@@ -807,7 +841,7 @@
 		return NULL;
 
 	if (self->closed) {
-		return PyString_FromString("");
+		return PyBytes_FromString("");
 	}
 
 	temp_pool = Pool(NULL);
@@ -823,7 +857,7 @@
 			return NULL;
 		}
 		RUN_SVN_WITH_POOL(temp_pool, svn_stream_read(self->stream, buffer, &size));
-		ret = PyString_FromStringAndSize(buffer, size);
+		ret = PyBytes_FromStringAndSize(buffer, size);
 		apr_pool_destroy(temp_pool);
 		return ret;
 	} else {
@@ -834,7 +868,7 @@
 							   temp_pool,
 							   temp_pool));
 		self->closed = TRUE;
-		ret = PyString_FromStringAndSize(result->data, result->len);
+		ret = PyBytes_FromStringAndSize(result->data, result->len);
 		apr_pool_destroy(temp_pool);
 		return ret;
 #else
@@ -853,7 +887,7 @@
 };
 
 PyTypeObject Stream_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"repos.Stream", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(StreamObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */

=== modified file 'subvertpy/util.h'
--- subvertpy/util.h	2012-02-24 06:42:47 +0000
+++ subvertpy/util.h	2012-04-07 06:08:21 +0000
@@ -20,6 +20,7 @@
 #ifndef _SUBVERTPY_UTIL_H_
 #define _SUBVERTPY_UTIL_H_
 
+#include "py_fixup.h"
 #include <svn_version.h>
 
 #if SVN_VER_MAJOR != 1
@@ -43,6 +44,13 @@
 #pragma GCC visibility push(hidden)
 #endif
 
+#if ONLY_BEFORE_SVN(1, 6)
+#define svn_dirent_internal_style svn_path_internal_style
+#defien svn_dirent_local_style svn_path_local_style
+#else
+#include <svn_dirent_uri.h>
+#endif
+
 svn_error_t *py_cancel_check(void *cancel_baton);
 __attribute__((warn_unused_result)) apr_pool_t *Pool(apr_pool_t *parent);
 void handle_svn_error(svn_error_t *error);
@@ -92,7 +100,7 @@
 apr_hash_t *config_hash_from_object(PyObject *config, apr_pool_t *pool);
 void PyErr_SetAprStatus(apr_status_t status);
 PyObject *py_dirent(const svn_dirent_t *dirent, int dirent_fields);
-PyObject *PyOS_tmpfile(void);
+PyObject *PyOS_tmpfile(apr_file_t** file, apr_pool_t* temp_pool);
 PyObject *pyify_changed_paths(apr_hash_t *changed_paths, bool node_kind, apr_pool_t *pool);
 #if ONLY_SINCE_SVN(1, 6)
 PyObject *pyify_changed_paths2(apr_hash_t *changed_paths2, apr_pool_t *pool);

=== modified file 'subvertpy/wc.c'
--- subvertpy/wc.c	2011-11-29 02:13:41 +0000
+++ subvertpy/wc.c	2012-04-07 06:08:21 +0000
@@ -39,9 +39,9 @@
 #define REPORTER_T svn_ra_reporter2_t
 #endif
 
-staticforward PyTypeObject Entry_Type;
-staticforward PyTypeObject Status_Type;
-staticforward PyTypeObject Adm_Type;
+static PyTypeObject Entry_Type;
+static PyTypeObject Status_Type;
+static PyTypeObject Adm_Type;
 
 static PyObject *py_entry(const svn_wc_entry_t *entry);
 static PyObject *py_status(const svn_wc_status2_t *status);
@@ -125,7 +125,7 @@
 	apr_pool_t *pool;
 	svn_wc_committed_queue_t *queue;
 } CommittedQueueObject;
-staticforward PyTypeObject CommittedQueue_Type;
+static PyTypeObject CommittedQueue_Type;
 
 #if ONLY_SINCE_SVN(1, 5)
 static svn_error_t *py_ra_report_set_path(void *baton, const char *path, svn_revnum_t revision, svn_depth_t depth, int start_empty, const char *lock_token, apr_pool_t *pool)
@@ -136,7 +136,7 @@
 		py_lock_token = Py_None;
 		Py_INCREF(py_lock_token);
 	} else {
-		py_lock_token = PyString_FromString(lock_token);
+		py_lock_token = PyBytes_FromString(lock_token);
 	}
 	ret = PyObject_CallMethod(self, "set_path", "slbOi", path, revision, start_empty, py_lock_token, depth);
 	Py_DECREF(py_lock_token);
@@ -154,7 +154,7 @@
 		py_lock_token = Py_None;
 		Py_INCREF(py_lock_token);
 	} else { 
-		py_lock_token = PyString_FromString(lock_token);
+		py_lock_token = PyBytes_FromString(lock_token);
 	}
 	ret = PyObject_CallMethod(self, "link_path", "sslbOi", path, url, revision, start_empty, py_lock_token, depth);
 	Py_DECREF(py_lock_token);
@@ -174,7 +174,7 @@
 		py_lock_token = Py_None;
 		Py_INCREF(py_lock_token);
 	} else {
-		py_lock_token = PyString_FromString(lock_token);
+		py_lock_token = PyBytes_FromString(lock_token);
 	}
 	ret = PyObject_CallMethod(self, "set_path", "slbOi", path, revision, start_empty, py_lock_token, svn_depth_infinity);
 	CB_CHECK_PYRETVAL(ret);
@@ -191,7 +191,7 @@
 		py_lock_token = Py_None;
 		Py_INCREF(py_lock_token);
 	} else { 
-		py_lock_token = PyString_FromString(lock_token);
+		py_lock_token = PyBytes_FromString(lock_token);
 	}
 	ret = PyObject_CallMethod(self, "link_path", "sslbOi", path, url, revision, start_empty, py_lock_token, svn_depth_infinity);
 	CB_CHECK_PYRETVAL(ret);
@@ -274,6 +274,7 @@
 
 static svn_error_t *py_wc_found_entry(const char *path, const svn_wc_entry_t *entry, void *walk_baton, apr_pool_t *pool)
 {
+	const char* ret_path;
 	PyObject *fn, *ret;
 	PyObject *callbacks = (PyObject *)walk_baton;
 	PyGILState_STATE state = PyGILState_Ensure();
@@ -282,7 +283,8 @@
 	} else {
 		fn = (PyObject *)walk_baton;
 	}
-	ret = PyObject_CallFunction(fn, "sO", path, py_entry(entry));
+	ret_path = svn_dirent_local_style(path, pool);
+	ret = PyObject_CallFunction(fn, "sO", ret_path, py_entry(entry));
 	CB_CHECK_PYRETVAL(ret);
 	Py_DECREF(ret);
 	PyGILState_Release(state);
@@ -382,7 +384,7 @@
 };
 
 static PyTypeObject Entry_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"wc.Entry", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(EntryObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -493,7 +495,7 @@
 };
 
 static PyTypeObject Status_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"wc.Status", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(StatusObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -622,7 +624,7 @@
 	}
 	Py_BEGIN_ALLOW_THREADS
 	err = svn_wc_adm_open3(&ret->adm, parent_wc, 
-						   svn_path_canonicalize(path, ret->pool),
+						   svn_dirent_internal_style(path, ret->pool),
 						   write_lock, depth, py_cancel_check, NULL, 
 						   ret->pool);
 	Py_END_ALLOW_THREADS
@@ -641,7 +643,7 @@
 {
 	AdmObject *admobj = (AdmObject *)self;
 	ADM_CHECK_CLOSED(admobj);
-	return PyString_FromString(svn_wc_adm_access_path(admobj->adm));
+	return PyUnicode_FromString(svn_wc_adm_access_path(admobj->adm));
 }
 
 static PyObject *adm_locked(PyObject *self)
@@ -672,7 +674,7 @@
 		ret = Py_None;
 		Py_INCREF(ret);
 	} else {
-		ret = PyString_FromStringAndSize(value->data, value->len);
+		ret = PyUnicode_DecodeUTF8(value->data, value->len, NULL);
 	}
 	apr_pool_destroy(temp_pool);
 	return ret;
@@ -778,7 +780,7 @@
 		return NULL;
 #if ONLY_SINCE_SVN(1, 5)
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_walk_entries3(
-			  svn_path_canonicalize(path, temp_pool), admobj->adm, 
+			  svn_dirent_internal_style(path, temp_pool), admobj->adm,
 				&py_wc_entry_callbacks2, (void *)callbacks,
 				depth, show_hidden, py_cancel_check, NULL,
 				temp_pool));
@@ -790,7 +792,7 @@
 		return NULL;
 	}
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_walk_entries2(
-			  svn_path_canonicalize(path, temp_pool), admobj->adm, 
+			  svn_dirent_internal_style(path, temp_pool), admobj->adm,
 				&py_wc_entry_callbacks, (void *)callbacks,
 				show_hidden, py_cancel_check, NULL,
 				temp_pool));
@@ -817,7 +819,7 @@
 	temp_pool = Pool(NULL);
 	if (temp_pool == NULL)
 		return NULL;
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_entry(&entry, svn_path_canonicalize(path, temp_pool), admobj->adm, show_hidden, temp_pool));
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_entry(&entry, svn_dirent_internal_style(path, temp_pool), admobj->adm, show_hidden, temp_pool));
 
 	if (entry == NULL) {
 		PyErr_Format(PyExc_KeyError, "No such entry '%s'", path);
@@ -850,7 +852,7 @@
 	if (temp_pool == NULL)
 		return NULL;
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_get_prop_diffs(&propchanges, &original_props,
-				svn_path_canonicalize(path, temp_pool), admobj->adm, temp_pool));
+				svn_dirent_internal_style(path, temp_pool), admobj->adm, temp_pool));
 	py_propchanges = PyList_New(propchanges->nelts);
 	if (py_propchanges == NULL) {
 		apr_pool_destroy(temp_pool);
@@ -904,7 +906,7 @@
 
 #if ONLY_SINCE_SVN(1, 6)
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_add3(
-						   svn_path_canonicalize(path, temp_pool), admobj->adm, depth, copyfrom_url, 
+							svn_dirent_internal_style(path, temp_pool), admobj->adm, depth, copyfrom_url,
 							copyfrom_rev, py_cancel_check, NULL,
 							py_wc_notify_func, 
 							(void *)notify_func, 
@@ -916,7 +918,7 @@
 		return NULL;
 	}
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_add2(
-						   svn_path_canonicalize(path, temp_pool), admobj->adm, copyfrom_url, 
+							svn_dirent_internal_style(path, temp_pool), admobj->adm, copyfrom_url,
 							copyfrom_rev, py_cancel_check, 
 							py_wc_notify_func, 
 							(void *)notify_func, 
@@ -1019,7 +1021,7 @@
 		return NULL;
 	traversal_info = svn_wc_init_traversal_info(temp_pool);
 #if ONLY_SINCE_SVN(1, 6)
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions4(svn_path_canonicalize(path, temp_pool), admobj->adm, 
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions4(svn_dirent_internal_style(path, temp_pool), admobj->adm,
 				&py_ra_reporter, (void *)reporter, 
 				restore_files, recurse?svn_depth_infinity:svn_depth_files,
 				honor_depth_exclude,
@@ -1027,14 +1029,14 @@
 				py_wc_notify_func, (void *)notify_func,
 				traversal_info, temp_pool));
 #elif ONLY_SINCE_SVN(1, 5)
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions3(svn_path_canonicalize(path, temp_pool), admobj->adm, 
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions3(svn_dirent_internal_style(path, temp_pool), admobj->adm,
 				&py_ra_reporter, (void *)reporter, 
 				restore_files, recurse?svn_depth_infinity:svn_depth_files, 
 				depth_compatibility_trick, use_commit_times, 
 				py_wc_notify_func, (void *)notify_func,
 				traversal_info, temp_pool));
 #else
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions2(svn_path_canonicalize(path, temp_pool), admobj->adm, 
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_crawl_revisions2(svn_dirent_internal_style(path, temp_pool), admobj->adm,
 				&py_ra_reporter, (void *)reporter, 
 				restore_files, recurse, use_commit_times, 
 				py_wc_notify_func, (void *)notify_func,
@@ -1142,11 +1144,11 @@
 
 	while (PyDict_Next(dict, &idx, &key, &val)) {
 		   svn_prop_t *prop = apr_palloc(pool, sizeof(svn_prop_t));
-		   prop->name = PyString_AsString(key);
+		   prop->name = _PyUnicode_AsString(key);
 		   if (val == Py_None) {
 			   prop->value = NULL;
 		   } else {
-			   prop->value = svn_string_ncreate(PyString_AsString(val), PyString_Size(val), pool);
+			   prop->value = svn_string_ncreate(_PyUnicode_AsString(val), PyUnicode_GetSize(val), pool);
 		   }
 		   APR_ARRAY_PUSH(*ret, svn_prop_t *) = prop;
 	}
@@ -1218,7 +1220,7 @@
 
 #if ONLY_SINCE_SVN(1, 6)
 	RUN_SVN_WITH_POOL(temp_pool, svn_wc_process_committed4(
-		svn_path_canonicalize(path, temp_pool), admobj->adm, recurse, new_revnum, 
+		svn_dirent_internal_style(path, temp_pool), admobj->adm, recurse, new_revnum,
 			rev_date, rev_author, wcprop_changes, 
 			remove_lock, remove_changelist, digest, temp_pool));
 #else
@@ -1227,7 +1229,7 @@
 		apr_pool_destroy(temp_pool);
 		return NULL;
 	}
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_process_committed3(svn_path_canonicalize(path, temp_pool), admobj->adm, recurse, new_revnum, 
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_process_committed3(svn_dirent_internal_style(path, temp_pool), admobj->adm, recurse, new_revnum,
 														   rev_date, rev_author, wcprop_changes, 
 														   remove_lock, digest, temp_pool));
 #endif
@@ -1268,9 +1270,9 @@
 	AdmObject *admobj = (AdmObject *)self;
 
 	if (admobj->adm == NULL) {
-		return PyString_FromFormat("<wc.WorkingCopy (closed) at 0x%p>", admobj);
+		return PyUnicode_FromFormat("<wc.WorkingCopy (closed) at 0x%p>", admobj);
 	} else {
-		return PyString_FromFormat("<wc.WorkingCopy at '%s'>", 
+		return PyUnicode_FromFormat("<wc.WorkingCopy at '%s'>", 
 								   svn_wc_adm_access_path(admobj->adm));
 	}
 }
@@ -1674,6 +1676,7 @@
 {
 	char *path;
 	const char *anchor = NULL, *target = NULL;
+	const char *ret_path = NULL;
 	apr_pool_t *temp_pool;
 	PyObject *ret;
 
@@ -1685,10 +1688,11 @@
 		return NULL;
 
 	RUN_SVN_WITH_POOL(temp_pool,
-		  svn_wc_get_actual_target(svn_path_canonicalize(path, temp_pool),
+		  svn_wc_get_actual_target(svn_dirent_internal_style(path, temp_pool),
 								   &anchor, &target, temp_pool));
 
-	ret = Py_BuildValue("(ss)", anchor, target);
+	ret_path = svn_dirent_local_style(anchor, temp_pool);
+	ret = Py_BuildValue("(ss)", ret_path, target);
 
 	apr_pool_destroy(temp_pool);
 
@@ -1712,7 +1716,8 @@
 		return NULL;
 
 	RUN_SVN_WITH_POOL(temp_pool,
-		  svn_wc_is_wc_root(&wc_root, path, admobj->adm, temp_pool));
+		svn_wc_is_wc_root(&wc_root, svn_dirent_internal_style(path, temp_pool),
+		admobj->adm, temp_pool));
 
 	apr_pool_destroy(temp_pool);
 
@@ -1743,10 +1748,10 @@
 
 	RUN_SVN_WITH_POOL(temp_pool,
 		svn_wc_transmit_text_deltas2(&tempfile, digest,
-			svn_path_canonicalize(path, temp_pool), admobj->adm, fulltext,
+			svn_dirent_internal_style(path, temp_pool), admobj->adm, fulltext,
 			&py_editor, editor_obj, temp_pool));
 
-	py_digest = PyString_FromStringAndSize((char *)digest, APR_MD5_DIGESTSIZE);
+	py_digest = PyBytes_FromStringAndSize((char *)digest, APR_MD5_DIGESTSIZE);
 	if (py_digest == NULL) {
 		apr_pool_destroy(temp_pool);
 		return NULL;
@@ -1783,7 +1788,7 @@
 	Py_INCREF(editor_obj);
 
 	RUN_SVN_WITH_POOL(temp_pool,
-		svn_wc_transmit_prop_deltas(svn_path_canonicalize(path, temp_pool),
+		svn_wc_transmit_prop_deltas(svn_dirent_internal_style(path, temp_pool),
 			admobj->adm, &(py_entry->entry), &py_editor, editor_obj, NULL, temp_pool));
 
 	apr_pool_destroy(temp_pool);
@@ -1808,7 +1813,7 @@
 		return NULL;
 
 	RUN_SVN_WITH_POOL(pool, svn_wc_adm_retrieve(&result, admobj->adm, 
-		svn_path_canonicalize(path, pool), pool));
+		svn_dirent_internal_style(path, pool), pool));
 
 	ret = PyObject_New(AdmObject, &Adm_Type);
 	if (ret == NULL)
@@ -1837,7 +1842,7 @@
 		return NULL;
 
 	RUN_SVN_WITH_POOL(pool, svn_wc_adm_probe_retrieve(&result, admobj->adm, 
-		svn_path_canonicalize(path, pool), pool));
+		svn_dirent_internal_style(path, pool), pool));
 
 	ret = PyObject_New(AdmObject, &Adm_Type);
 	if (ret == NULL)
@@ -1868,7 +1873,7 @@
 		return NULL;
 
 	RUN_SVN_WITH_POOL(pool, svn_wc_adm_probe_try3(&result, admobj->adm, 
-		svn_path_canonicalize(path, pool), writelock, levels_to_lock,
+		svn_dirent_internal_style(path, pool), writelock, levels_to_lock,
 		py_cancel_check, NULL, pool));
 
 	if (result == NULL) {
@@ -2024,7 +2029,7 @@
 	RUN_SVN_WITH_POOL(temp_pool, 
 			svn_wc_status2(
 				&st,
-				svn_path_canonicalize(svn_path_join(svn_wc_adm_access_path(admobj->adm), path, temp_pool), temp_pool),
+				svn_dirent_internal_style(svn_path_join(svn_wc_adm_access_path(admobj->adm), path, temp_pool), temp_pool),
 				admobj->adm,
 				temp_pool));
 
@@ -2068,7 +2073,7 @@
 	{ "get_ancestry", (PyCFunction)get_ancestry, METH_VARARGS,
 		"S.get_ancestry(path) -> (url, rev)" },
 	{ "maybe_set_repos_root", (PyCFunction)maybe_set_repos_root, METH_VARARGS, "S.maybe_set_repos_root(path, repos)" },
-	{ "add_repos_file", (PyCFunction)add_repos_file, METH_KEYWORDS, 
+	{ "add_repos_file", (PyCFunction)add_repos_file, METH_VARARGS | METH_KEYWORDS, 
 		"S.add_repos_file(dst_path, new_base_contents, new_contents, new_base_props, new_props, copyfrom_url=None, copyfrom_rev=-1, notify_func=None)" },
 	{ "mark_missing_deleted", (PyCFunction)mark_missing_deleted, METH_VARARGS,
 		"S.mark_missing_deleted(path)" },
@@ -2101,7 +2106,7 @@
 };
 
 static PyTypeObject Adm_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"wc.WorkingCopy", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(AdmObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2180,7 +2185,7 @@
 {
 	CommittedQueueObject *cqobj = (CommittedQueueObject *)self;
 
-	return PyString_FromFormat("<wc.CommittedQueue at 0x%p>", cqobj->queue);
+	return PyUnicode_FromFormat("<wc.CommittedQueue at 0x%p>", cqobj->queue);
 }
 
 static PyObject *committed_queue_init(PyTypeObject *self, PyObject *args, PyObject *kwargs)
@@ -2270,7 +2275,7 @@
 };
 
 static PyTypeObject CommittedQueue_Type = {
-	PyObject_HEAD_INIT(NULL) 0,
+	PyVarObject_HEAD_INIT(NULL, 0)
 	"wc.CommittedQueue", /*	const char *tp_name;  For printing, in format "<module>.<name>" */
 	sizeof(CommittedQueueObject), 
 	0,/*	Py_ssize_t tp_basicsize, tp_itemsize;  For allocation */
@@ -2364,7 +2369,7 @@
 	RUN_SVN_WITH_POOL(temp_pool, 
 			svn_wc_revision_status(
 				&revstatus, 
-				svn_path_canonicalize(wc_path, temp_pool),
+				svn_dirent_internal_style(wc_path, temp_pool),
 				trail_url,
 				 committed, py_cancel_check, NULL, temp_pool));
 	ret = Py_BuildValue("(llbb)", revstatus->min_rev, revstatus->max_rev, 
@@ -2432,7 +2437,7 @@
 	if (pool == NULL)
 		return NULL;
 	dir = svn_wc_get_adm_dir(pool);
-	ret = PyString_FromString(dir);
+	ret = PyUnicode_FromString(dir);
 	apr_pool_destroy(pool);
 	return ret;
 }
@@ -2472,9 +2477,9 @@
 	PyErr_WarnEx(PyExc_DeprecationWarning, "get_pristine_copy_path is deprecated. Use get_pristine_contents instead.", 2);
 #endif
 	RUN_SVN_WITH_POOL(pool,
-		  svn_wc_get_pristine_copy_path(svn_path_canonicalize(path, pool),
+		  svn_wc_get_pristine_copy_path(svn_dirent_internal_style(path, pool),
 										&pristine_path, pool));
-	ret = PyString_FromString(pristine_path);
+	ret = PyUnicode_FromString(pristine_path);
 	apr_pool_destroy(pool);
 	return ret;
 }
@@ -2506,7 +2511,7 @@
 		return NULL;
 	}
 
-	RUN_SVN_WITH_POOL(stream_pool, svn_wc_get_pristine_contents(&stream, svn_path_canonicalize(path, temp_pool), stream_pool, temp_pool));
+	RUN_SVN_WITH_POOL(stream_pool, svn_wc_get_pristine_contents(&stream, svn_dirent_internal_style(path, temp_pool), stream_pool, temp_pool));
 	apr_pool_destroy(temp_pool);
 
 	if (stream == NULL) {
@@ -2527,7 +2532,7 @@
 	temp_pool = Pool(NULL);
 	if (temp_pool == NULL)
 		return NULL;
-	RUN_SVN_WITH_POOL(temp_pool, svn_wc_get_pristine_copy_path(svn_path_canonicalize(path, temp_pool), &pristine_path, temp_pool));
+	RUN_SVN_WITH_POOL(temp_pool, svn_wc_get_pristine_copy_path(svn_dirent_internal_style(path, temp_pool), &pristine_path, temp_pool));
 	ret = PyFile_FromString((char *)pristine_path, "rb");
 	apr_pool_destroy(temp_pool);
 	return ret;
@@ -2552,7 +2557,7 @@
 		return NULL;
 #if ONLY_SINCE_SVN(1, 5)
 	RUN_SVN_WITH_POOL(pool, 
-					  svn_wc_ensure_adm3(svn_path_canonicalize(path, pool),
+					  svn_wc_ensure_adm3(svn_dirent_internal_style(path, pool),
 										 uuid, url, repos, rev, depth, pool));
 #else
 	if (depth != svn_depth_infinity) {
@@ -2562,7 +2567,7 @@
 		return NULL;
 	}
 	RUN_SVN_WITH_POOL(pool, 
-					  svn_wc_ensure_adm2(svn_path_canonicalize(path, pool),
+					  svn_wc_ensure_adm2(svn_dirent_internal_style(path, pool),
 										 uuid, url, repos, rev, pool));
 #endif
 	apr_pool_destroy(pool);
@@ -2581,7 +2586,7 @@
 	pool = Pool(NULL);
 	if (pool == NULL)
 		return NULL;
-	RUN_SVN_WITH_POOL(pool, svn_wc_check_wc(svn_path_canonicalize(path, pool), &wc_format, pool));
+	RUN_SVN_WITH_POOL(pool, svn_wc_check_wc(svn_dirent_internal_style(path, pool), &wc_format, pool));
 	apr_pool_destroy(pool);
 	return PyLong_FromLong(wc_format);
 }
@@ -2677,42 +2682,44 @@
 	{ NULL, }
 };
 
-void initwc(void)
+PyModule_Init_DEFINE(wc)
 {
-	PyObject *mod;
+	PyObject *mod = NULL;
 
 	if (PyType_Ready(&Entry_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Status_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Adm_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Editor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&FileEditor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&DirectoryEditor_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&TxDeltaWindowHandler_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&Stream_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
 
 	if (PyType_Ready(&CommittedQueue_Type) < 0)
-		return;
+		PyModule_RETURN(mod);
+
+
 
 	apr_initialize();
 
-	mod = Py_InitModule3("wc", wc_methods, "Working Copies");
+	PyModule_DEFINE(mod, "wc", "Working Copies", wc_methods)
 	if (mod == NULL)
-		return;
+		PyModule_RETURN(mod);
 
 	PyModule_AddIntConstant(mod, "SCHEDULE_NORMAL", 0);
 	PyModule_AddIntConstant(mod, "SCHEDULE_ADD", 1);
@@ -2773,4 +2780,5 @@
 
 	PyModule_AddObject(mod, "CommittedQueue", (PyObject *)&CommittedQueue_Type);
 	Py_INCREF(&CommittedQueue_Type);
+	PyModule_RETURN(mod);
 }