diff options
| author | Georg Brandl <georg@python.org> | 2012-10-28 18:13:40 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2012-10-28 18:13:40 +0100 |
| commit | 9df24c6468c9f431e45d4875d743cc914a1a86a3 (patch) | |
| tree | aa9133c34dd1c819ef0b8d91d038add2125fabea /sphinx/util/osutil.py | |
| parent | ad6318e7f16e61ae694a5ffa87b1c7f4497c3698 (diff) | |
| parent | 2f1f4c6be2dfc5caec235d4309d948b2a87bde8a (diff) | |
| download | sphinx-git-9df24c6468c9f431e45d4875d743cc914a1a86a3.tar.gz | |
Merged in macfreek/sphinx/stable (pull request #59)
Diffstat (limited to 'sphinx/util/osutil.py')
| -rw-r--r-- | sphinx/util/osutil.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/sphinx/util/osutil.py b/sphinx/util/osutil.py index 5becc37df..131c6b9c7 100644 --- a/sphinx/util/osutil.py +++ b/sphinx/util/osutil.py @@ -40,12 +40,20 @@ def relative_uri(base, to): return to b2 = base.split(SEP) t2 = to.split(SEP) - # remove common segments - for x, y in zip(b2, t2): + # remove common segments (except the last segment) + for x, y in zip(b2[:-1], t2[:-1]): if x != y: break b2.pop(0) t2.pop(0) + if b2 == t2: + # Special case: relative_uri('f/index.html','f/index.html') + # returns '', not 'index.html' + return '' + if len(b2) == 1 and t2 == ['']: + # Special case: relative_uri('f/index.html','f/') should + # return './', not '' + return '.' + SEP return ('..' + SEP) * (len(b2)-1) + SEP.join(t2) |