Commit 0b8832e3 authored by Fred Drake's avatar Fred Drake

- simplify code that sorts the results list for FTP LIST

- only sort the results once
parent 5fb69afb
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
############################################################################## ##############################################################################
__doc__="""Object Manager __doc__="""Object Manager
$Id: ObjectManager.py,v 1.167 2003/12/15 22:09:25 fdrake Exp $""" $Id: ObjectManager.py,v 1.168 2003/12/16 01:38:18 fdrake Exp $"""
__version__='$Revision: 1.167 $'[11:-2] __version__='$Revision: 1.168 $'[11:-2]
import App.Management, Acquisition, Globals, CopySupport, Products import App.Management, Acquisition, Globals, CopySupport, Products
import os, App.FactoryDispatcher, re, Products import os, App.FactoryDispatcher, re, Products
...@@ -598,11 +598,7 @@ class ObjectManager( ...@@ -598,11 +598,7 @@ class ObjectManager(
files = all_files files = all_files
try: files = list(files)
files.sort()
except AttributeError:
files=list(files)
files.sort()
# Perform globbing on list of files (ajung) # Perform globbing on list of files (ajung)
...@@ -610,11 +606,7 @@ class ObjectManager( ...@@ -610,11 +606,7 @@ class ObjectManager(
if globbing : if globbing :
files = filter(lambda x,g=globbing: fnmatch.fnmatch(x[0],g), files) files = filter(lambda x,g=globbing: fnmatch.fnmatch(x[0],g), files)
try: files.sort()
files.sort()
except AttributeError:
files=list(files)
files.sort()
if not (hasattr(self,'isTopLevelPrincipiaApplicationObject') and if not (hasattr(self,'isTopLevelPrincipiaApplicationObject') and
self.isTopLevelPrincipiaApplicationObject): self.isTopLevelPrincipiaApplicationObject):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment