[py-svn] r51471 - in py/branch/guido-svn-auth/py: . path/svn

[hpk at codespeak.net]

Author: hpk
Date: Thu Feb 14 08:44:45 2008
New Revision: 51471

Removed:
   py/branch/guido-svn-auth/py/path/svn/auth.py
Modified:
   py/branch/guido-svn-auth/py/__init__.py
   py/branch/guido-svn-auth/py/path/svn/svncommon.py
Log:
put SvnAuth helper to existing file instead of small new one


Modified: py/branch/guido-svn-auth/py/__init__.py
==============================================================================
--- py/branch/guido-svn-auth/py/__init__.py	(original)
+++ py/branch/guido-svn-auth/py/__init__.py	Thu Feb 14 08:44:45 2008
@@ -67,7 +67,7 @@
     'path.svnwc'             : ('./path/svn/wccommand.py', 'SvnWCCommandPath'),
     'path.svnurl'            : ('./path/svn/urlcommand.py', 'SvnCommandPath'),
     'path.local'             : ('./path/local/local.py', 'LocalPath'),
-    'path.SvnAuth'           : ('./path/svn/auth.py', 'SvnAuth'),
+    'path.SvnAuth'           : ('./path/svn/svncommon.py', 'SvnAuth'),
 
     # some nice slightly magic APIs
     'magic.__doc__'          : ('./magic/__init__.py', '__doc__'),

Deleted: /py/branch/guido-svn-auth/py/path/svn/auth.py
==============================================================================
--- /py/branch/guido-svn-auth/py/path/svn/auth.py	Thu Feb 14 08:44:45 2008
+++ (empty file)
@@ -1,14 +0,0 @@
-class SvnAuth(object):
-    """ container for auth information for Subversion """
-    def __init__(self, username, password, auth_cache=True):
-        self.username = username
-        self.password = password
-        self.auth_cache = auth_cache
-
-    def __str__(self):
-        uname = self.username.replace('"', '\\"')
-        passwd = self.password.replace('"', '\\"')
-        ret = '--username="%s" --password="%s"' % (uname, passwd)
-        if not self.auth_cache:
-            ret += ' --no-auth-cache'
-        return ret

Modified: py/branch/guido-svn-auth/py/path/svn/svncommon.py
==============================================================================
--- py/branch/guido-svn-auth/py/path/svn/svncommon.py	(original)
+++ py/branch/guido-svn-auth/py/path/svn/svncommon.py	Thu Feb 14 08:44:45 2008
@@ -330,3 +330,18 @@
         fspath = '%s at HEAD' % (fspath,)
     return 'file://%s' % (fspath,)
 
+
+class SvnAuth(object):
+    """ container for auth information for Subversion """
+    def __init__(self, username, password, auth_cache=True):
+        self.username = username
+        self.password = password
+        self.auth_cache = auth_cache
+
+    def __str__(self):
+        uname = self.username.replace('"', '\\"')
+        passwd = self.password.replace('"', '\\"')
+        ret = '--username="%s" --password="%s"' % (uname, passwd)
+        if not self.auth_cache:
+            ret += ' --no-auth-cache'
+        return ret