pep8 pyflake cleanups

Author: furlongm

hooks/yum/patchman.py

@@ -1,12 +1,11 @@
 import os
-from glob import fnmatch
 
-import yum
-from yum.plugins import PluginYumExit, TYPE_CORE
+from yum.plugins import TYPE_CORE
 
 requires_api_version = '2.1'
 plugin_type = (TYPE_CORE,)
 
+
 def posttrans_hook(conduit):
     conduit.info(2, 'patchman: sending data')
     servicecmd = conduit.confString('main', 'servicecmd', '/usr/sbin/patchman-client')

patchman/hosts/models.py

@@ -17,7 +17,6 @@
 
 from django.db import models
 from django.db.models import Q, Count
-from django.dispatch import Signal
 
 from rpm import labelCompare
 from debian.debian_support import Version, version_compare
@@ -28,9 +27,9 @@
 from patchman.repos.models import Repository
 from patchman.operatingsystems.models import OS
 from patchman.arch.models import MachineArchitecture
-from patchman.hosts.managers import HostManager
 from patchman.hosts.signals import host_update_found
 
+
 class Host(models.Model):
 
     hostname = models.CharField(max_length=255, unique=True)
@@ -63,14 +62,14 @@ def nonsec_count(self):
         return self.updates.filter(security=False).count()
 
     def get_host_repo_packages(self):
-        hostrepos = Q(mirror__repo__osgroup__os__host=self, mirror__repo__arch=self.arch)|Q(mirror__repo__in=self.repos.all())
+        hostrepos = Q(mirror__repo__osgroup__os__host=self, mirror__repo__arch=self.arch) | Q(mirror__repo__in=self.repos.all())
         return Package.objects.select_related().filter(hostrepos)
 
     def find_updates(self):
 
         self.updates.clear()
 
-        kernels = Q(name__name='kernel')|Q(name__name='kernel-xen')|Q(name__name='kernel-pae')|Q(name__name='kernel-devel')|Q(name__name='kernel-pae-devel')|Q(name__name='kernel-xen-devel')|Q(name__name='kernel-headers')
+        kernels = Q(name__name='kernel') | Q(name__name='kernel-xen') | Q(name__name='kernel-pae') | Q(name__name='kernel-devel') | Q(name__name='kernel-pae-devel') | Q(name__name='kernel-xen-devel') | Q(name__name='kernel-headers')
         kernelpackages = Package.objects.select_related().filter(host=self).filter(kernels).values('name__name').annotate(Count('name'))
 
         repopackages = self.get_host_repo_packages()
@@ -96,14 +95,14 @@ def find_updates(self):
                             highestpackage = repopackage
 
             if highest != ('', '0', ''):
-                hostrepos = Q(repo__osgroup__os__host=self, repo__arch=self.arch)|Q(repo__host=self)
+                hostrepos = Q(repo__osgroup__os__host=self, repo__arch=self.arch) | Q(repo__host=self)
                 matchingrepos = highestpackage.mirror_set.filter(hostrepos)
                 security = False
                 # If any of the containing repos are security, mark the update as security
                 for mirror in matchingrepos:
                     if mirror.repo.security == True:
                         security = True
-                update, c = PackageUpdate.objects.get_or_create(oldpackage=package,newpackage=highestpackage,security=security)
+                update, c = PackageUpdate.objects.get_or_create(oldpackage=package, newpackage=highestpackage, security=security)
                 self.updates.add(update)
                 host_update_found.send(sender=self, update=update)
 
@@ -115,8 +114,8 @@ def find_updates(self):
             for package in kernelpackages:
                 host_highest = ('', '', '')
                 repo_highest = ('', '', '')
-                host_highestpackage = None
-                repo_highestpackage = None
+                host_highest_package = None
+                repo_highest_package = None
                 matchingpackages = repopackages.filter(Q(name__name=package['name__name']))
                 for repopackage in matchingpackages:
                     repokernel = repopackage._version_string_rpm()
@@ -143,6 +142,6 @@ def find_updates(self):
                     self.reboot_required = True
                 else:
                     self.reboot_required = False
-        except ValueError: #debian kernel
+        except ValueError:  # debian kernel
             pass
         self.save()

patchman/hosts/signals.py

@@ -16,5 +16,4 @@
 
 from django.dispatch import Signal
 
-host_update_found = Signal(providing_args=["update"])
-
+host_update_found = Signal(providing_args=['update'])

patchman/hosts/views.py

@@ -14,72 +14,67 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
-from django.utils.datastructures import MultiValueDictKeyError
-from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import permission_required, login_required
+from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
 from django.core.urlresolvers import reverse
-from django.views.decorators.csrf import csrf_exempt
-from django.db.models import Q, Count
+from django.db.models import Q
 from django.contrib import messages
-from tagging.models import Tag, TaggedItem
+from tagging.models import Tag
 
 from andsome.util.filterspecs import Filter, FilterBar
-from datetime import datetime, date, time
 import socket
 
 from patchman.hosts.models import Host
 from patchman.domains.models import Domain
-from patchman.packages.models import Package, PackageName
 from patchman.arch.models import MachineArchitecture
-from patchman.repos.models import Repository
 from patchman.operatingsystems.models import OS, OSGroup
 from patchman.reports.models import Report
 
+
 @login_required
 def host_list(request):
 
     hosts = Host.objects.select_related()
 
-    if request.REQUEST.has_key('domain'):
+    if 'domain' in request.REQUEST:
         hosts = hosts.filter(domain=int(request.GET['domain']))
 
-    if request.REQUEST.has_key('package_id'):
+    if 'package_id' in request.REQUEST:
         hosts = hosts.filter(packages=int(request.GET['package_id']))
 
-    if request.REQUEST.has_key('package'):
+    if 'package' in request.REQUEST:
         hosts = hosts.filter(packages__name__name=request.GET['package'])
 
-    if request.REQUEST.has_key('repo'):
+    if 'repo' in request.REQUEST:
         hosts = hosts.filter(repos=int(request.GET['repo']))
 
-    if request.REQUEST.has_key('arch'):
+    if 'arch' in request.REQUEST:
         hosts = hosts.filter(arch=int(request.GET['arch']))
 
-    if request.REQUEST.has_key('os'):
+    if 'os' in request.REQUEST:
         hosts = hosts.filter(os=int(request.GET['os']))
 
-    if request.REQUEST.has_key('osgroup'):
+    if 'osgroup' in request.REQUEST:
         hosts = hosts.filter(os__osgroup=int(request.GET['osgroup']))
 
-    if request.REQUEST.has_key('tag'):
+    if 'tag' in request.REQUEST:
         hosts = hosts.filter(tags=request.GET['tag'])
 
-    if request.REQUEST.has_key('reboot_required'):
+    if 'reboot_required' in request.REQUEST:
         hosts = hosts.filter(reboot_required=request.GET['reboot_required'])
 
-    if request.REQUEST.has_key('search'):
+    if 'search' in request.REQUEST:
         terms = request.REQUEST['search'].lower()
         query = Q()
         for term in terms.split(' '):
-            q = Q(hostname__icontains = term)
+            q = Q(hostname__icontains=term)
             query = query & q
         hosts = hosts.filter(query)
     else:
-        terms = ""
+        terms = ''
 
     try:
         page_no = int(request.GET.get('page', 1))
@@ -96,7 +91,7 @@ def host_list(request):
     filter_list = []
     mytags = {}
     for tag in Tag.objects.usage_for_model(Host):
-        mytags[tag.name]=tag.name
+        mytags[tag.name] = tag.name
     filter_list.append(Filter(request, 'tag', mytags))
     filter_list.append(Filter(request, 'domain', Domain.objects.all()))
     filter_list.append(Filter(request, 'os', OS.objects.all()))
@@ -120,19 +115,20 @@ def host_detail(request, hostname):
 
     reports = Report.objects.all().filter(host=hostname).order_by('-time')[:3]
 
-    return render_to_response('hosts/host_detail.html', {'host': host, 'reversedns': reversedns, 'reports': reports }, context_instance=RequestContext(request))
+    return render_to_response('hosts/host_detail.html', {'host': host, 'reversedns': reversedns, 'reports': reports}, context_instance=RequestContext(request))
+
 
 @login_required
 def host_delete(request, hostname):
 
     host = get_object_or_404(Host, hostname=hostname)
 
     if request.method == 'POST':
-        if request.REQUEST.has_key('delete'):
+        if 'delete' in request.REQUEST:
             host.delete()
-            messages.info(request, "Host %s has been deleted." % hostname)
+            messages.info(request, 'Host %s has been deleted' % hostname)
             return HttpResponseRedirect(reverse('host_list'))
-        elif request.REQUEST.has_key('cancel'):
+        elif 'cancel' in request.REQUEST:
             return HttpResponseRedirect(reverse('host_detail', args=[hostname]))
 
     try:

patchman/operatingsystems/views.py

@@ -14,25 +14,19 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
-from django.utils.datastructures import MultiValueDictKeyError
-from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from django.http import HttpResponseRedirect
-from django.contrib.auth.decorators import permission_required, login_required
+from django.contrib.auth.decorators import login_required
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.core.urlresolvers import reverse
-from django.views.decorators.csrf import csrf_exempt
-from django.db.models import Q, Count
+from django.db.models import Q
 from django.contrib import messages
 
-from andsome.util.filterspecs import Filter, FilterBar
-from datetime import datetime, date, time
-import socket
+from andsome.util.filterspecs import FilterBar
 
 from patchman.operatingsystems.models import OS, OSGroup
 from patchman.operatingsystems.forms import LinkOSGroupForm, AddReposToOSGroupForm, CreateOSGroupForm
-from patchman.repos.models import Repository
+
 
 @login_required
 def os_list(request):
@@ -44,16 +38,15 @@ def os_list(request):
     except ValueError:
         page_no = 1
 
-    if request.REQUEST.has_key('search'):
+    if 'search' in request.REQUEST:
         terms = request.REQUEST['search'].lower()
         query = Q()
         for term in terms.split(' '):
-            q = Q(name__icontains = term)
+            q = Q(name__icontains=term)
             query = query & q
         oses = oses.filter(query)
     else:
-        terms = ""
-
+        terms = ''
     p = Paginator(oses, 50)
 
     try:
@@ -78,18 +71,19 @@ def os_detail(request, os_id):
             osgroup = create_form.save()
             os.osgroup = osgroup
             os.save()
-            messages.info(request, "Created and linked to new OS Group")
+            messages.info(request, 'Created and linked to new OS Group')
             return HttpResponseRedirect(os.get_absolute_url())
         link_form = LinkOSGroupForm(request.POST, instance=os, prefix='link')
         if link_form.is_valid():
             link_form.save()
-            messages.info(request, "Link to OS Group successful")
+            messages.info(request, 'Link to OS Group successful')
             return HttpResponseRedirect(os.get_absolute_url())
     else:
         link_form = LinkOSGroupForm(instance=os, prefix='link')
         create_form = CreateOSGroupForm(prefix='create')
 
-    return render_to_response('operatingsystems/os_detail.html', {'os': os, 'link_form': link_form, 'create_form': create_form }, context_instance=RequestContext(request))
+    return render_to_response('operatingsystems/os_detail.html', {'os': os, 'link_form': link_form, 'create_form': create_form}, context_instance=RequestContext(request))
+
 
 @login_required
 def osgroup_list(request):
@@ -101,15 +95,15 @@ def osgroup_list(request):
     except ValueError:
         page_no = 1
 
-    if request.REQUEST.has_key('search'):
+    if 'search' in request.REQUEST:
         terms = request.REQUEST['search'].lower()
         query = Q()
         for term in terms.split(' '):
-            q = Q(name__icontains = term)
+            q = Q(name__icontains=term)
             query = query & q
         osgroups = osgroups.filter(query)
     else:
-        terms = ""
+        terms = ''
 
     p = Paginator(osgroups, 50)
 
@@ -123,6 +117,7 @@ def osgroup_list(request):
 
     return render_to_response('operatingsystems/osgroup_list.html', {'page': page, 'filter_bar': filter_bar}, context_instance=RequestContext(request))
 
+
 @login_required
 def osgroup_detail(request, osgroup_id):
 
@@ -132,9 +127,9 @@ def osgroup_detail(request, osgroup_id):
         form = AddReposToOSGroupForm(request.POST, instance=osgroup)
         if form.is_valid():
             form.save()
-            messages.info(request, "Modified Repositories")
+            messages.info(request, 'Modified Repositories')
             return HttpResponseRedirect(osgroup.get_absolute_url())
 
     form = AddReposToOSGroupForm(instance=osgroup)
 
-    return render_to_response('operatingsystems/osgroup_detail.html', {'osgroup': osgroup, 'form': form }, context_instance=RequestContext(request))
+    return render_to_response('operatingsystems/osgroup_detail.html', {'osgroup': osgroup, 'form': form}, context_instance=RequestContext(request))