2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00

cleaning unused settings

This commit is contained in:
Philip Sargent 2022-04-06 21:01:31 +03:00
parent 18c2892967
commit ed71fa48f1
2 changed files with 5 additions and 2 deletions

View File

@ -37,7 +37,7 @@ def pathsreport(request):
"EXPOUSER" : str( settings.EXPOUSER), "EXPOUSER" : str( settings.EXPOUSER),
"EXPOWEB" : str( settings.EXPOWEB), "EXPOWEB" : str( settings.EXPOWEB),
"EXPOWEB_URL" : str( settings.EXPOWEB_URL), "EXPOWEB_URL" : str( settings.EXPOWEB_URL),
"FILES" : str( settings.FILES), # "FILES" : str( settings.FILES),
"LIBDIR" : str( settings.LIBDIR), "LIBDIR" : str( settings.LIBDIR),
"LOGFILE" : str( settings.LOGFILE), "LOGFILE" : str( settings.LOGFILE),
"LOGIN_REDIRECT_URL" : str( settings.LOGIN_REDIRECT_URL), "LOGIN_REDIRECT_URL" : str( settings.LOGIN_REDIRECT_URL),
@ -74,7 +74,7 @@ def pathsreport(request):
"EXPOUSER" : type(settings.EXPOUSER), "EXPOUSER" : type(settings.EXPOUSER),
"EXPOWEB" : type(settings.EXPOWEB), "EXPOWEB" : type(settings.EXPOWEB),
"EXPOWEB_URL" : type(settings.EXPOWEB_URL), "EXPOWEB_URL" : type(settings.EXPOWEB_URL),
"FILES" : type(settings.FILES), # "FILES" : type(settings.FILES),
"LIBDIR" : type( settings.LIBDIR), "LIBDIR" : type( settings.LIBDIR),
"LOGFILE" : type(settings.LOGFILE), "LOGFILE" : type(settings.LOGFILE),
"LOGIN_REDIRECT_URL" : type(settings.LOGIN_REDIRECT_URL), "LOGIN_REDIRECT_URL" : type(settings.LOGIN_REDIRECT_URL),

View File

@ -68,6 +68,9 @@ def get_or_create_placeholder(year):
return placeholder_logbook_entry return placeholder_logbook_entry
def listdir(*directories): def listdir(*directories):
'''WHAT is this ?! Some python2 fossil. The only use of settings.SURVEYS
local import statement to be avoided, please.
'''
try: try:
return os.listdir(os.path.join(settings.SURVEYS, *directories)) return os.listdir(os.path.join(settings.SURVEYS, *directories))
except: except: