← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/http/__init__.py

Merge from mainline

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/__init__.py
143
143
        # I'm concerned about when it chooses to strip the last
144
144
        # portion of the path, and when it doesn't.
145
145
        path = '/'.join(basepath)
146
 
        return urlparse.urlunparse((self._qualified_proto,
 
146
        if path == '':
 
147
            path = '/'
 
148
        result = urlparse.urlunparse((self._qualified_proto,
147
149
                                    self._host, path, '', '', ''))
 
150
        return result
148
151
 
149
152
    def _real_abspath(self, relpath):
150
153
        """Produce absolute path, adjusting protocol if needed"""
340
343
#---------------- test server facilities ----------------
341
344
# TODO: load these only when running tests
342
345
 
 
346
 
343
347
class WebserverNotAvailable(Exception):
344
348
    pass
345
349