From: Guido van Rossum <guido@python.org>
Date: Mon, 23 May 1994 12:17:05 +0000 (+0000)
Subject: dospath: fix by Amrit (don't normalize glob patterns away)
X-Git-Tag: v1.1~333
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3b4903a9f24ba2a9af3f26b8f402ef7bce52a2f;p=thirdparty%2FPython%2Fcpython.git

dospath: fix by Amrit (don't normalize glob patterns away)
ftplib: get rid of non-auto port assignment
---

diff --git a/Lib/dospath.py b/Lib/dospath.py
index 1479e1be8c76..770174fccc8e 100644
--- a/Lib/dospath.py
+++ b/Lib/dospath.py
@@ -10,6 +10,12 @@ import string
 # backslashes and maps invalid consecutive characters to a single '_'.
 # Other normalizations (such as optimizing '../' away) are not allowed
 # (this is done by normpath).
+#
+# Amrit: Things that can be valid regular expressions cannot be normalized
+#        away.  (which is pretty much all special characters)
+#
+#        I am assuming that at least these chars may be used:
+#				[, ], |, *, +, ?
 
 mapchar = '_'
 
@@ -20,7 +26,7 @@ def normcase(s):
 			res = res + os.sep
 		elif c == '.' and res[-1:] == os.sep:
 			res = res + mapchar + c
-		elif ord(c) < 32 or c in ' "*+,:;<=>?[]|':
+		elif ord(c) < 32 or c in ' ",:;<=>':
 			if res[-1:] != mapchar:
 				res = res + mapchar
 		else: