Merge branch 'master' of mara.ddp.net:photoassistant

pa_job_manager.py

@@ -307,7 +307,7 @@ def SymlinkName(path, file):
     else:
         last_bit = os.path.dirname(sig_bit)
     symlink = 'static'+'/'+last_dir+'/'+last_bit
-    if symlink[-1] == os.path.sep:
+    if symlink[-1] == '/':
         symlink=symlink[0:-1]
     return symlink
 
@@ -387,9 +387,6 @@ def JobImportDir(job):
                     fname=file.replace(path, "")
                     stat = os.stat(file)
                     dirname=SymlinkName(path, file)
-                    # hack to cater for windows paths and my keep_dirs dict
-                    if 'c:' in jex.value:
-                        dirname=dirname.replace('\\','/')
                     if stat.st_ctime > keep_dirs[dirname].last_import_date:
                         if DEBUG==1:
                             AddLogForJob(job, "DEBUG: {} - {} is newer than {}".format( file, stat.st_ctime, keep_dirs[dirname].last_import_date ), file )