Mercurial > hgsubversion
changeset 667:e872f549e42f
svnwrap: s/core.SubversionException/SubversionException/
A recent change made core.SubversionException a member of
svnwrap. Referencing it directly makes the code ever so slightly
cleaner.
No functionality change.
| author | Dan Villiom Podlaski Christiansen <danchr@gmail.com> |
|---|---|
| date | Wed, 11 Aug 2010 19:57:35 +0200 |
| parents | 192a3f65837a |
| children | 6be7c9ace365 |
| files | hgsubversion/svnwrap/svn_swig_wrapper.py |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/hgsubversion/svnwrap/svn_swig_wrapper.py +++ b/hgsubversion/svnwrap/svn_swig_wrapper.py @@ -257,8 +257,8 @@ class SubversionRepo(object): path=urllib.quote(path) url = urlparse.urlunparse((scheme, netloc, path, params, query, fragment)) self.ra = ra.open2(url, callbacks, - svn_config, self.pool) - except core.SubversionException, e: + svn_config, self.pool) + except SubversionException, e: if e.apr_err == core.SVN_ERR_RA_SERF_SSL_CERT_UNTRUSTED: msg = ('Subversion does not trust the SSL certificate for this ' 'site; please try running \'svn ls %s\' first.' @@ -291,7 +291,7 @@ class SubversionRepo(object): self.pool) return holder[-1] - except core.SubversionException, e: + except SubversionException, e: if e.apr_err not in [core.SVN_ERR_FS_NOT_FOUND]: raise else: @@ -454,7 +454,7 @@ class SubversionRepo(object): try: ra.replay(self.ra, revision, oldest_rev_i_have, True, e_ptr, e_baton, self.pool) - except core.SubversionException, e: #pragma: no cover + except SubversionException, e: #pragma: no cover # can I depend on this number being constant? if (e.apr_err == core.SVN_ERR_RA_NOT_IMPLEMENTED or e.apr_err == core.SVN_ERR_UNSUPPORTED_FEATURE): @@ -502,7 +502,7 @@ class SubversionRepo(object): client.diff3([], url2, optrev(other_rev), url, optrev(revision), True, True, deleted, ignore_type, 'UTF-8', out, err, self.client_context, self.pool) - except core.SubversionException, e: + except SubversionException, e: # "Can't write to stream: The handle is invalid." # This error happens systematically under Windows, possibly # related to file handles being non-write shareable by default. @@ -541,7 +541,7 @@ class SubversionRepo(object): info = info[-1] mode = ("svn:executable" in info) and 'x' or '' mode = ("svn:special" in info) and 'l' or mode - except core.SubversionException, e: + except SubversionException, e: notfound = (core.SVN_ERR_FS_NOT_FOUND, core.SVN_ERR_RA_DAV_PATH_NOT_FOUND) if e.args[1] in notfound: # File not found @@ -563,7 +563,7 @@ class SubversionRepo(object): try: pl = client.proplist2(rpath, rev, rev, False, self.client_context, self.pool) - except core.SubversionException, e: + except SubversionException, e: # Specified path does not exist at this revision if e.apr_err == core.SVN_ERR_NODE_UNKNOWN_KIND: raise IOError(errno.ENOENT, e.args[0]) @@ -585,7 +585,7 @@ class SubversionRepo(object): rev = optrev(revision) try: entries = client.ls(rpath, rev, True, self.client_context, pool) - except core.SubversionException, e: + except SubversionException, e: if e.apr_err == core.SVN_ERR_FS_NOT_FOUND: raise IOError(errno.ENOENT, '%s cannot be found at r%d' % (dirpath, revision))