From: Guido van Rossum <guido@python.org>
Date: Fri, 1 Sep 1995 20:32:21 +0000 (+0000)
Subject: rationalized os.path.split() so split "/a/" yields "/a", ""
X-Git-Tag: v1.3~154
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a89b1bade562cf4ed5e03a67d151ce49c16a172a;p=thirdparty%2FPython%2Fcpython.git

rationalized os.path.split() so split "/a/" yields "/a", ""
---

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 05cc92ae2f69..c288f3b5b39f 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -32,21 +32,15 @@ def join(a, b):
 
 
 # Split a path in head (everything up to the last '/') and tail (the
-# rest).  If the original path ends in '/' but is not the root, this
-# '/' is stripped.  After the trailing '/' is stripped, the invariant
-# join(head, tail) == p holds.
-# The resulting head won't end in '/' unless it is the root.
+# rest).  If the path ends in '/', tail will be empty.  If there is no
+# '/' in the path, head  will be empty.
+# Trailing '/'es are stripped from head unless it is the root.
 
 def split(p):
-	if p[-1:] == '/' and p <> '/'*len(p):
-		while p[-1] == '/':
-			p = p[:-1]
-	head, tail = '', ''
-	for c in p:
-		tail = tail + c
-		if c == '/':
-			head, tail = head + tail, ''
-	if head[-1:] == '/' and head <> '/'*len(head):
+	import string
+	i = string.rfind(p, '/') + 1
+	head, tail = p[:i], p[i:]
+	if head and head <> '/'*len(head):
 		while head[-1] == '/':
 			head = head[:-1]
 	return head, tail