mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	Renamed path.cat to path.join
This commit is contained in:
		
							parent
							
								
									ca197b520e
								
							
						
					
					
						commit
						ac62b9e7cb
					
				
					 2 changed files with 8 additions and 4 deletions
				
			
		| 
						 | 
				
			
			@ -1,5 +1,7 @@
 | 
			
		|||
# DirList -- Directory Listing widget
 | 
			
		||||
 | 
			
		||||
# XXX Displays messy paths when following '..'
 | 
			
		||||
 | 
			
		||||
try:
 | 
			
		||||
	import posix, path
 | 
			
		||||
	os = posix
 | 
			
		||||
| 
						 | 
				
			
			@ -20,8 +22,8 @@ def create(self, (parent, dirname)):
 | 
			
		|||
		self = VSplit.create(self, parent)
 | 
			
		||||
		names = os.listdir(dirname)
 | 
			
		||||
		for name in names:
 | 
			
		||||
			if path.isdir(path.cat(dirname, name)):
 | 
			
		||||
				fullname = path.cat(dirname, name)
 | 
			
		||||
			if path.isdir(path.join(dirname, name)):
 | 
			
		||||
				fullname = path.join(dirname, name)
 | 
			
		||||
				btn = SubdirButton().definetext(self, fullname)
 | 
			
		||||
			elif name[-3:] = '.py':
 | 
			
		||||
				btn = ModuleButton().definetext(self, name)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,5 +1,7 @@
 | 
			
		|||
# DirList -- Directory Listing widget
 | 
			
		||||
 | 
			
		||||
# XXX Displays messy paths when following '..'
 | 
			
		||||
 | 
			
		||||
try:
 | 
			
		||||
	import posix, path
 | 
			
		||||
	os = posix
 | 
			
		||||
| 
						 | 
				
			
			@ -20,8 +22,8 @@ def create(self, (parent, dirname)):
 | 
			
		|||
		self = VSplit.create(self, parent)
 | 
			
		||||
		names = os.listdir(dirname)
 | 
			
		||||
		for name in names:
 | 
			
		||||
			if path.isdir(path.cat(dirname, name)):
 | 
			
		||||
				fullname = path.cat(dirname, name)
 | 
			
		||||
			if path.isdir(path.join(dirname, name)):
 | 
			
		||||
				fullname = path.join(dirname, name)
 | 
			
		||||
				btn = SubdirButton().definetext(self, fullname)
 | 
			
		||||
			elif name[-3:] = '.py':
 | 
			
		||||
				btn = ModuleButton().definetext(self, name)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue