head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-3-PATCH002:1.2;
locks; strict;
comment	@# @;


1.3
date	98.07.11.20.33.14;	author tsarna;	state dead;
branches;
next	1.2;

1.2
date	98.05.06.21.39.52;	author tron;	state Exp;
branches;
next	1.1;

1.1
date	98.05.04.19.29.22;	author tron;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Two changes:
 - Use -fPIC instead of -fpic (latter breaks py-Numeric on sparc).
   Suggested by tv@@netbsd.org. This is inherited by most py-*
   packages. Change sent to guido@@cnri.reston.va.us.

 - Remove official patches from patches dir. Use PATCHFILES mechanism
   instead to get them from www.python.org.
@
text
@--- Lib/urllib.py.orig	Sat Apr 11 03:18:35 1998
+++ Lib/urllib.py	Wed May  6 23:26:57 1998
@@@@ -221,6 +221,7 @@@@
 		else:
 			host, selector = url
 			urltype, rest = splittype(selector)
+			url = rest
 			user_passwd = None
 			if string.lower(urltype) != 'http':
 				realhost = None
@@@@ -455,8 +456,8 @@@@
 		user, passwd = self.get_user_passwd(host, realm, i)
 		if not (user or passwd): return None
 		host = user + ':' + passwd + '@@' + host
-		newurl = '//' + host + selector
-		return self.open_http(newurl)
+		newurl = 'http://' + host + selector
+		return self.open(newurl)
 
 	def get_user_passwd(self, host, realm, clear_cache = 0):
 		key = realm + '@@' + string.lower(host)
@


1.2
log
@Add or update patches for Python 1.5.1 as suggested by Jaromir Dolecek
in PR pkg/5407 and PR pkg/5412.
@
text
@@


1.1
log
@Update python to version 1.5.1 using package by Jaromir Dolecek.
Fixes PR pkg/5361.
@
text
@d1 21
a21 50
Index: Lib/urllib.py
===================================================================
RCS file: /projects/cvsroot/python/dist/src/Lib/urllib.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -c -r1.64 -r1.65
*** urllib.py	1998/04/11 01:18:35	1.64
--- urllib.py	1998/04/27 15:19:17	1.65
***************
*** 214,222 ****
  	# Use HTTP protocol
  	def open_http(self, url, data=None):
  		import httplib
  		if type(url) is type(""):
  			host, selector = splithost(url)
! 			user_passwd, host = splituser(host)
  			realhost = host
  		else:
  			host, selector = url
--- 214,224 ----
  	# Use HTTP protocol
  	def open_http(self, url, data=None):
  		import httplib
+ 		user_passwd = None
  		if type(url) is type(""):
  			host, selector = splithost(url)
! 			if host:
! 				user_passwd, host = splituser(host)
  			realhost = host
  		else:
  			host, selector = url
***************
*** 226,232 ****
  				realhost = None
  			else:
  				realhost, rest = splithost(rest)
! 				user_passwd, realhost = splituser(realhost)
  				if user_passwd:
  					selector = "%s://%s%s" % (urltype,
  								  realhost,
--- 228,236 ----
  				realhost = None
  			else:
  				realhost, rest = splithost(rest)
! 				if realhost:
! 					user_passwd, realhost = \
! 						     splituser(realhost)
  				if user_passwd:
  					selector = "%s://%s%s" % (urltype,
  								  realhost,
@