flake8 fixes

This commit is contained in:
Chris Meyers
2015-07-20 11:20:17 -04:00
parent 7af1d5530d
commit 2dc22042ee
3 changed files with 97 additions and 97 deletions

View File

@@ -82,99 +82,99 @@ TEST_FACT_SERVICES = [
] ]
TEST_FACT_FILES = [ TEST_FACT_FILES = [
{ {
"uid": 0, "uid": 0,
"woth": False, "woth": False,
"mtime": 1436810539.5895822, "mtime": 1436810539.5895822,
"inode": 525214, "inode": 525214,
"isgid": False, "isgid": False,
"size": 0, "size": 0,
"isuid": False, "isuid": False,
"isreg": True, "isreg": True,
"gid": 0, "gid": 0,
"ischr": False, "ischr": False,
"wusr": True, "wusr": True,
"xoth": False, "xoth": False,
"islnk": False, "islnk": False,
"nlink": 1, "nlink": 1,
"issock": False, "issock": False,
"rgrp": True, "rgrp": True,
"path": "/test/1948", "path": "/test/1948",
"xusr": False, "xusr": False,
"atime": 1436810539.5895822, "atime": 1436810539.5895822,
"isdir": False, "isdir": False,
"ctime": 1436810539.5895822, "ctime": 1436810539.5895822,
"isblk": False, "isblk": False,
"wgrp": False, "wgrp": False,
"xgrp": False, "xgrp": False,
"dev": 64768, "dev": 64768,
"roth": True, "roth": True,
"isfifo": False, "isfifo": False,
"mode": "0644", "mode": "0644",
"rusr": True "rusr": True
}, },
{ {
"uid": 0, "uid": 0,
"woth": False, "woth": False,
"mtime": 1436810540.4955823, "mtime": 1436810540.4955823,
"inode": 526295, "inode": 526295,
"isgid": False, "isgid": False,
"size": 0, "size": 0,
"isuid": False, "isuid": False,
"isreg": True, "isreg": True,
"gid": 0, "gid": 0,
"ischr": False, "ischr": False,
"wusr": True, "wusr": True,
"xoth": False, "xoth": False,
"islnk": False, "islnk": False,
"nlink": 1, "nlink": 1,
"issock": False, "issock": False,
"rgrp": True, "rgrp": True,
"path": "/test/3029", "path": "/test/3029",
"xusr": False, "xusr": False,
"atime": 1436810540.4955823, "atime": 1436810540.4955823,
"isdir": False, "isdir": False,
"ctime": 1436810540.4955823, "ctime": 1436810540.4955823,
"isblk": False, "isblk": False,
"wgrp": False, "wgrp": False,
"xgrp": False, "xgrp": False,
"dev": 64768, "dev": 64768,
"roth": True, "roth": True,
"isfifo": False, "isfifo": False,
"mode": "0644", "mode": "0644",
"rusr": True "rusr": True
}, },
{ {
"uid": 0, "uid": 0,
"woth": False, "woth": False,
"mtime": 1436810540.5825822, "mtime": 1436810540.5825822,
"inode": 526401, "inode": 526401,
"isgid": False, "isgid": False,
"size": 0, "size": 0,
"isuid": False, "isuid": False,
"isreg": True, "isreg": True,
"gid": 0, "gid": 0,
"ischr": False, "ischr": False,
"wusr": True, "wusr": True,
"xoth": False, "xoth": False,
"islnk": False, "islnk": False,
"nlink": 1, "nlink": 1,
"issock": False, "issock": False,
"rgrp": True, "rgrp": True,
"path": "/test/3135", "path": "/test/3135",
"xusr": False, "xusr": False,
"atime": 1436810540.5825822, "atime": 1436810540.5825822,
"isdir": False, "isdir": False,
"ctime": 1436810540.5825822, "ctime": 1436810540.5825822,
"isblk": False, "isblk": False,
"wgrp": False, "wgrp": False,
"xgrp": False, "xgrp": False,
"dev": 64768, "dev": 64768,
"roth": True, "roth": True,
"isfifo": False, "isfifo": False,
"mode": "0644", "mode": "0644",
"rusr": True "rusr": True
}, },
] ]
FACT_FIXTURES = { FACT_FIXTURES = {

View File

@@ -1256,8 +1256,8 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions):
if not super(InventoryUpdate, self).can_start: if not super(InventoryUpdate, self).can_start:
return False return False
if (self.source != 'custom' if (self.source != 'custom' and
and not (self.credential and self.credential.active)): not (self.credential and self.credential.active)):
return False return False
return True return True

View File

@@ -47,8 +47,8 @@ class ProjectOptions(models.Model):
def get_local_path_choices(cls): def get_local_path_choices(cls):
if os.path.exists(settings.PROJECTS_ROOT): if os.path.exists(settings.PROJECTS_ROOT):
paths = [x.decode('utf-8') for x in os.listdir(settings.PROJECTS_ROOT) paths = [x.decode('utf-8') for x in os.listdir(settings.PROJECTS_ROOT)
if os.path.isdir(os.path.join(settings.PROJECTS_ROOT, x)) if (os.path.isdir(os.path.join(settings.PROJECTS_ROOT, x)) and
and not x.startswith('.') and not x.startswith('_')] not x.startswith('.') and not x.startswith('_'))]
qs = Project.objects.filter(active=True) qs = Project.objects.filter(active=True)
used_paths = qs.values_list('local_path', flat=True) used_paths = qs.values_list('local_path', flat=True)
return [x for x in paths if x not in used_paths] return [x for x in paths if x not in used_paths]