mirror of
https://github.com/shlomif/PySolFC.git
synced 2025-04-05 00:02:29 -04:00
Ran 2to3 on pysollib/a*.py .
This commit is contained in:
parent
891d4baeb5
commit
9f8adfe4c8
1 changed files with 12 additions and 12 deletions
|
@ -1275,12 +1275,7 @@ Please select a %s type %s.
|
||||||
#
|
#
|
||||||
|
|
||||||
def loadPlugins(self, dir):
|
def loadPlugins(self, dir):
|
||||||
if not dir or not os.path.isdir(dir):
|
for name in self._my_list_dir(dir):
|
||||||
return
|
|
||||||
names = os.listdir(dir)
|
|
||||||
names = map(os.path.normcase, names)
|
|
||||||
names.sort()
|
|
||||||
for name in names:
|
|
||||||
m = re.search(r"^(.+)\.py$", name)
|
m = re.search(r"^(.+)\.py$", name)
|
||||||
n = os.path.join(dir, name)
|
n = os.path.join(dir, name)
|
||||||
if m and os.path.isfile(n):
|
if m and os.path.isfile(n):
|
||||||
|
@ -1528,6 +1523,16 @@ Please select a %s type %s.
|
||||||
if not manager.getByName(obj.name):
|
if not manager.getByName(obj.name):
|
||||||
manager.register(obj)
|
manager.register(obj)
|
||||||
|
|
||||||
|
def _my_list_dir(self, dir):
|
||||||
|
"""docstring for _my_list_dir"""
|
||||||
|
if dir and os.path.isdir(dir):
|
||||||
|
names = os.listdir(dir)
|
||||||
|
names = list(map(os.path.normcase, names))
|
||||||
|
names.sort()
|
||||||
|
return names
|
||||||
|
else:
|
||||||
|
return []
|
||||||
|
|
||||||
#
|
#
|
||||||
# init samples / music
|
# init samples / music
|
||||||
#
|
#
|
||||||
|
@ -1539,12 +1544,7 @@ Please select a %s type %s.
|
||||||
if dir:
|
if dir:
|
||||||
dir = os.path.normpath(dir)
|
dir = os.path.normpath(dir)
|
||||||
try:
|
try:
|
||||||
names = []
|
for name in self._my_list_dir(dir):
|
||||||
if dir and os.path.isdir(dir):
|
|
||||||
names = os.listdir(dir)
|
|
||||||
names = map(os.path.normcase, names)
|
|
||||||
names.sort()
|
|
||||||
for name in names:
|
|
||||||
if not name or not ext_re.search(name):
|
if not name or not ext_re.search(name):
|
||||||
continue
|
continue
|
||||||
f = os.path.join(dir, name)
|
f = os.path.join(dir, name)
|
||||||
|
|
Loading…
Add table
Reference in a new issue