遵循pep8规范

MadKingClient/core/HouseStark.py

@@ -24,19 +24,22 @@ def parse_argv(self):
             self.help_msg()
     def help_msg(self):
         msg = '''
-        collect_data
+        collect_data       收集硬件信息
         run_forever
         get_asset_id
-        report_asset
+        report_asset       收集硬件信息并汇报 
         '''
         print(msg)
 
     def collect_data(self):
+        """收集硬件信息"""
         obj = info_collection.InfoCollection()
         asset_data = obj.collect()
         #print asset_data
+
     def run_forever(self):
         pass
+
     def __attach_token(self,url_str):
         '''generate md5 by token_id and username,and attach it on the url request'''
         user = settings.Params['auth']['user']
@@ -82,7 +85,7 @@ def __submit_data(self,action_type,data,method):
                     res_data = urllib2.urlopen(req,timeout=settings.Params['request_timeout'])
                     callback = res_data.read()
                     callback = json.loads(callback)
-                    print "\033[31;1m[%s]:[%s]\033[0m response:\n%s" %(method,url,callback)
+                    print("\033[31;1m[%s]:[%s]\033[0m response:\n%s" %(method,url,callback))
                     return callback
                 except Exception as e:
                     sys.exit("\033[31;1m%s\033[0m"%e)
@@ -136,7 +139,7 @@ def report_asset(self):
         self.log_record(response)
 
     def log_record(self,log,action_type=None):
-        f = file(settings.Params["log_file"],"ab")
+        f = open(settings.Params["log_file"],"ab")
         if log is str:
             pass
         if type(log) is dict:

MadKingClient/core/info_collection.py

@@ -9,14 +9,12 @@ class InfoCollection(object):
     def __init__(self):
         pass
 
-
     def get_platform(self):
 
         os_platform = platform.system()
 
         return os_platform
 
-
     def collect(self):
         os_platform = self.get_platform()
         try:
@@ -26,6 +24,7 @@ def collect(self):
             return formatted_data
         except AttributeError as e:
             sys.exit("Error:MadKing doens't support os [%s]! " % os_platform)
+
     def Linux(self):
         sys_info = plugin_api.LinuxSysInfo()
 
@@ -38,6 +37,7 @@ def Windows(self):
         #f.write(json.dumps(sys_info))
         #f.close()
         return sys_info
+
     def build_report_data(self,data):
 
         #add token info in here before send

assets/admin.py

@@ -12,6 +12,18 @@
 
 from django.contrib.auth import  forms as auth_form
 
+
+class BaseAdmin(object):
+    """自定义admin类"""
+
+
+    choice_fields = []
+    fk_fields = []
+    dynamic_fk = None
+    dynamic_list_display = []
+    dynamic_choice_fields = []
+    m2m_fields = []
+
 class UserCreationForm(forms.ModelForm):
     """A form for creating new users. Includes all the required
     fields, plus a repeated password."""
@@ -98,14 +110,17 @@ class CPUInline(admin.TabularInline):
     model = models.CPU
     exclude = ('memo',)
     readonly_fields = ['create_date']
+
 class NICInline(admin.TabularInline):
     model = models.NIC
     exclude = ('memo',)
     readonly_fields = ['create_date']
+
 class RAMInline(admin.TabularInline):
     model = models.RAM
     exclude = ('memo',)
     readonly_fields = ['create_date']
+
 class DiskInline(admin.TabularInline):
     model = models.Disk
     exclude = ('memo',)
@@ -130,13 +145,12 @@ class NicAdmin(admin.ModelAdmin):
     search_fields = ('macaddress','ipaddress')
 
 
-class EventLogAdmin(admin.ModelAdmin):
+class EventLogAdmin(admin.ModelAdmin,BaseAdmin):
     list_display = ('name','colored_event_type','asset','component','detail','date','user')
     search_fields = ('asset',)
     list_filter = ('event_type','component','date','user')
 
 
-
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponseRedirect