1
=== modified file 'desktopcouch/pair/couchdb_pairing/couchdb_io.py'
2
--- desktopcouch/pair/couchdb_pairing/couchdb_io.py	2009-09-30 15:52:57 +0000
3
+++ desktopcouch/pair/couchdb_pairing/couchdb_io.py	2009-10-07 13:29:11 +0000
4
@@ -18,6 +18,7 @@
5
18
"""Communicate with CouchDB."""
18
"""Communicate with CouchDB."""
6
19
19
7
20
import logging
20
import logging
8
21
import urllib
9
21
22
10
22
from desktopcouch import find_port as desktopcouch_find_port
23
from desktopcouch import find_port as desktopcouch_find_port
11
23
from desktopcouch.records import server
24
from desktopcouch.records import server
12
@@ -33,10 +34,12 @@
13
33
def mkuri(hostname, port, has_ssl=False, path="", auth_pair=None):
34
def mkuri(hostname, port, has_ssl=False, path="", auth_pair=None):
14
34
    """Create a URI from parts."""
35
    """Create a URI from parts."""
15
35
    protocol = "https" if has_ssl else "http"
36
    protocol = "https" if has_ssl else "http"
20
36
    auth = (":".join(map(urllib.quote, auth_pair) + "@")) if auth_pair else ""
37
    if auth_pair:
21
37
    port = int(port)
38
        auth = (":".join(map(urllib.quote, auth_pair)) + "@")
22
38
    uri = "%(protocol)s://%(auth)s%(hostname)s:%(port)d/%(path)s" % locals()
39
    else:
23
39
    return uri
40
        auth = ""
24
41
    port = str(port)
25
42
    return "%s://%s%s:%s/%s" % (protocol, auth, hostname, port, path)
26
40
43
27
41
def _get_db(name, create=True, uri=None):
44
def _get_db(name, create=True, uri=None):
28
42
    """Get (and create?) a database."""
45
    """Get (and create?) a database."""
29
@@ -224,7 +227,7 @@
30
224
                    target_ssl, target_oauth)
227
                    target_ssl, target_oauth)
31
225
        logging.debug("db exists, and we're ready to replicate")
228
        logging.debug("db exists, and we're ready to replicate")
32
226
    except:
229
    except:
34
227
        logging.exception("can't create/verify %r %s:%d  oauth=%s", 
230
        logging.exception("can't create/verify %r %s:%d  oauth=%s",
35
228
                target_database, target_host, target_port, target_oauth)
231
                target_database, target_host, target_port, target_oauth)
36
229
232
37
230
    try:
233
    try:
38
231
234
39
=== modified file 'desktopcouch/pair/tests/test_couchdb_io.py'
40
--- desktopcouch/pair/tests/test_couchdb_io.py	2009-09-24 13:46:17 +0000
41
+++ desktopcouch/pair/tests/test_couchdb_io.py	2009-10-07 13:29:11 +0000
42
@@ -113,6 +113,13 @@
43
113
        self.assertEquals(len(got), 1)
113
        self.assertEquals(len(got), 1)
44
114
        self.assertEquals(got, again)
114
        self.assertEquals(got, again)
45
115
115
46
116
    def test_mkuri(self):
47
117
        uri = couchdb_io.mkuri(
48
118
            'fnord.org', 55241, has_ssl=True, path='a/b/c',
49
119
            auth_pair=('f o o', 'b=a=r'))
50
120
        self.assertEquals(
51
121
            'https://f%20o%20o:b%3Da%3Dr@fnord.org:55241/a/b/c', uri)
52
122
53
116
    def Xtest_replication_good(self):
123
    def Xtest_replication_good(self):
54
117
        pass
124
        pass
55
118
125
Status:	Merged
Approved by:	Stuart Langridge on 2009-10-07
Approved revision:	80
Merged at revision:	not available
Proposed branch:	lp://qastaging/~thisfred/desktopcouch/fix-missing-import
Merge into:	lp://qastaging/desktopcouch
Diff against target:	54 lines 2 files modified desktopcouch/pair/couchdb_pairing/couchdb_io.py (+8/-5) desktopcouch/pair/tests/test_couchdb_io.py (+7/-0)
To merge this branch:	bzr merge lp://qastaging/~thisfred/desktopcouch/fix-missing-import
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Stuart Langridge (community)		Approve on 2009-10-07
Mark G. Saye (community)	2009-10-06	Approve on 2009-10-07
Review via email: mp+12953@code.qastaging.launchpad.net