Merge 0.4.

[jelmer/subvertpy.git] / auth.py

diff --git a/auth.py b/auth.py
index affadc811b0d3a88144620f58a98a8fef4cd4ef4..b613676ca33b56f3a25b2e4e58e28263e7fc8429 100644 (file)
--- a/auth.py
+++ b/auth.py
@@ -17,21 +17,23 @@
 
 from bzrlib.config import AuthenticationConfig
 from bzrlib.ui import ui_factory
-from ra import (get_username_prompt_provider,
-                get_simple_prompt_provider,
-                get_ssl_server_trust_prompt_provider,
-                get_ssl_client_cert_pw_prompt_provider,
-                get_simple_provider, get_username_provider, 
-                get_ssl_client_cert_file_provider, 
-                get_ssl_client_cert_pw_file_provider,
-                get_ssl_server_trust_file_provider,
-                Auth
-                )
-import ra
-import constants
+from bzrlib.plugins.svn.ra import (get_username_prompt_provider, 
+                                   get_simple_prompt_provider,
+                                   get_ssl_server_trust_prompt_provider,
+                                   get_ssl_client_cert_pw_prompt_provider)
+                                   get_simple_provider, get_username_provider, 
+                                   get_ssl_client_cert_file_provider, 
+                                   get_ssl_client_cert_pw_file_provider,
+                                   get_ssl_server_trust_file_provider,
+                                   Auth
+                                   )
+from bzrlib.plugins.svn import ra
 import urlparse
 import urllib
 
+AUTH_PARAM_DEFAULT_USERNAME = 'svn:auth:username'
+AUTH_PARAM_DEFAULT_PASSWORD = 'svn:auth:password'
+
 class SubversionAuthenticationConfig(AuthenticationConfig):
     """Simple extended version of AuthenticationConfig that can provide 
     the information Subversion requires.
@@ -82,11 +84,11 @@ class SubversionAuthenticationConfig(AuthenticationConfig):
             credentials.has_key("verify_certificates") and 
             credentials["verify_certificates"] == False):
             accepted_failures = (
-                    constants.AUTH_SSL_NOTYETVALID + 
-                    constants.AUTH_SSL_EXPIRED +
-                    constants.AUTH_SSL_CNMISMATCH +
-                    constants.AUTH_SSL_UNKNOWNCA +
-                    constants.AUTH_SSL_OTHER)
+                    AUTH_SSL_NOTYETVALID + 
+                    AUTH_SSL_EXPIRED +
+                    AUTH_SSL_CNMISMATCH +
+                    AUTH_SSL_UNKNOWNCA +
+                    AUTH_SSL_OTHER)
         else:
             accepted_failures = 0
         return (accepted_failures, False)
@@ -178,7 +180,7 @@ def create_auth_baton(url):
     if creds is not None:
         (user, password) = urllib.splitpasswd(creds)
         if user is not None:
-            auth_baton.set_parameter(svn.core.SVN_AUTH_PARAM_DEFAULT_USERNAME, user)
+            auth_baton.set_parameter(AUTH_PARAM_DEFAULT_USERNAME, user)
         if password is not None:
-            auth_baton.set_parameter(svn.core.SVN_AUTH_PARAM_DEFAULT_PASSWORD, password)
+            auth_baton.set_parameter(AUTH_PARAM_DEFAULT_PASSWORD, password)
     return auth_baton