Index: /branches/0.8-stable/scripts/trac-admin =================================================================== --- /branches/0.8-stable/scripts/trac-admin (revision 1146) +++ /branches/0.8-stable/scripts/trac-admin (revision 1583) @@ -485,5 +485,5 @@ repository_dir = arg[1] templates_dir = arg[2] - from svn import util, repos, core + from svn import core, repos core.apr_initialize() pool = core.svn_pool_create(None) Index: /branches/0.8-stable/trac/core.py =================================================================== --- /branches/0.8-stable/trac/core.py (revision 1260) +++ /branches/0.8-stable/trac/core.py (revision 1583) @@ -448,5 +448,5 @@ def open_svn_repos(repos_dir): - from svn import util, repos, core + from svn import core, repos core.apr_initialize() Index: /branches/0.8-stable/trac/sync.py =================================================================== --- /branches/0.8-stable/trac/sync.py (revision 806) +++ /branches/0.8-stable/trac/sync.py (revision 1583) @@ -20,5 +20,5 @@ # Author: Jonas Borgström -from svn import fs, util, delta, repos, core +from svn import core, fs, delta, repos def sync(db, repos, fs_ptr, pool): @@ -28,8 +28,8 @@ """ - if util.SVN_VER_MAJOR < 1: + if core.SVN_VER_MAJOR < 1: raise EnvironmentError, \ "Subversion >= 1.0 required: Found %d.%d.%d" % \ - (util.SVN_VER_MAJOR, util.SVN_VER_MINOR, util.SVN_VER_MICRO) + (core.SVN_VER_MAJOR, core.SVN_VER_MINOR, core.SVN_VER_MICRO) cursor = db.cursor() @@ -43,11 +43,11 @@ for rev in range(num): message = fs.revision_prop(fs_ptr, rev + offset, - util.SVN_PROP_REVISION_LOG, subpool) + core.SVN_PROP_REVISION_LOG, subpool) author = fs.revision_prop(fs_ptr, rev + offset, - util.SVN_PROP_REVISION_AUTHOR, subpool) + core.SVN_PROP_REVISION_AUTHOR, subpool) date = fs.revision_prop(fs_ptr, rev + offset, - util.SVN_PROP_REVISION_DATE, subpool) + core.SVN_PROP_REVISION_DATE, subpool) - date = util.svn_time_from_cstring(date, subpool) / 1000000 + date = core.svn_time_from_cstring(date, subpool) / 1000000 cursor.execute ('INSERT INTO revision (rev, time, author, message) ' Index: /branches/0.8-stable/trac/util.py =================================================================== --- /branches/0.8-stable/trac/util.py (revision 1138) +++ /branches/0.8-stable/trac/util.py (revision 1583) @@ -33,6 +33,6 @@ def svn_date_to_string(date, pool): - from svn import util - date_seconds = util.svn_time_from_cstring(date, + from svn import core + date_seconds = core.svn_time_from_cstring(date, pool) / 1000000 return time.strftime('%x %X', time.localtime(date_seconds)) Index: /branches/0.8-stable/trac/File.py =================================================================== --- /branches/0.8-stable/trac/File.py (revision 1479) +++ /branches/0.8-stable/trac/File.py (revision 1583) @@ -305,7 +305,7 @@ # Try to do an educated guess about the mime-type - self.mime_type = svn.fs.node_prop (root, self.path, - svn.util.SVN_PROP_MIME_TYPE, - self.pool) + self.mime_type = svn.fs.node_prop(root, self.path, + svn.core.SVN_PROP_MIME_TYPE, + self.pool) if not self.mime_type: self.mime_type = self.env.mimeview.get_mimetype(filename=self.path) or \ @@ -322,8 +322,8 @@ self.length = svn.fs.file_length(root, self.path, self.pool) date = svn.fs.revision_prop(self.fs_ptr, self.rev, - svn.util.SVN_PROP_REVISION_DATE, self.pool) - date_seconds = svn.util.svn_time_from_cstring(date, self.pool) / 1000000 + svn.core.SVN_PROP_REVISION_DATE, self.pool) + date_seconds = svn.core.svn_time_from_cstring(date, self.pool) / 1000000 self.last_modified = time.strftime("%a, %d %b %Y %H:%M:%S GMT", - time.gmtime(date_seconds)) + time.gmtime(date_seconds)) fd = svn.fs.file_contents(root, self.path, self.pool) - self.read_func = lambda x, f=fd: svn.util.svn_stream_read(f, x) + self.read_func = lambda x, f=fd: svn.core.svn_stream_read(f, x) Index: /branches/0.8-stable/trac/Log.py =================================================================== --- /branches/0.8-stable/trac/Log.py (revision 1244) +++ /branches/0.8-stable/trac/Log.py (revision 1583) @@ -44,5 +44,5 @@ shortlog = util.shorten_line(util.wiki_escape_newline(log)) - t = svn.util.svn_time_from_cstring(date, pool) / 1000000 + t = svn.core.svn_time_from_cstring(date, pool) / 1000000 gmt = time.gmtime(t) item = { Index: /branches/0.8-stable/trac/Changeset.py =================================================================== --- /branches/0.8-stable/trac/Changeset.py (revision 1270) +++ /branches/0.8-stable/trac/Changeset.py (revision 1583) @@ -60,7 +60,7 @@ # and the new version uses the same charset, not always the case # but that's all we can do... - mime_type = svn.fs.node_prop (self.new_root, new_path, - svn.util.SVN_PROP_MIME_TYPE, - pool) + mime_type = svn.fs.node_prop(self.new_root, new_path, + svn.core.SVN_PROP_MIME_TYPE, + pool) # We don't have to guess if the charset is specified in the # svn:mime-type property Index: /branches/0.8-stable/trac/Browser.py =================================================================== --- /branches/0.8-stable/trac/Browser.py (revision 1203) +++ /branches/0.8-stable/trac/Browser.py (revision 1583) @@ -75,9 +75,9 @@ created_rev = svn.fs.node_created_rev(root, fullpath, self.pool) date = svn.fs.revision_prop(self.fs_ptr, created_rev, - svn.util.SVN_PROP_REVISION_DATE, + svn.core.SVN_PROP_REVISION_DATE, self.pool) if date: - date_seconds = svn.util.svn_time_from_cstring(date, - self.pool) / 1000000 + date_seconds = svn.core.svn_time_from_cstring(date, + self.pool) / 1000000 date = time.strftime('%x %X', time.localtime(date_seconds)) else: @@ -85,9 +85,9 @@ date = '' author = svn.fs.revision_prop(self.fs_ptr, created_rev, - svn.util.SVN_PROP_REVISION_AUTHOR, - self.pool) + svn.core.SVN_PROP_REVISION_AUTHOR, + self.pool) change = svn.fs.revision_prop(self.fs_ptr, created_rev, - svn.util.SVN_PROP_REVISION_LOG, - self.pool) + svn.core.SVN_PROP_REVISION_LOG, + self.pool) item = { 'name' : name,