Browse Source

fixing pylint issues

ayush.goyal 4 năm trước cách đây
mục cha
commit
ef6719b1fa
2 tập tin đã thay đổi với 49 bổ sung22 xóa
  1. 32 15
      apps/oozie/src/oozie/forms.py
  2. 17 7
      apps/oozie/src/oozie/views/editor.py

+ 32 - 15
apps/oozie/src/oozie/forms.py

@@ -17,7 +17,7 @@
 
 from builtins import object
 import logging
-from datetime import datetime,  timedelta
+from datetime import datetime, timedelta
 from time import mktime, struct_time
 
 from django import forms
@@ -101,7 +101,7 @@ class ImportJobsubDesignForm(forms.Form):
   """Used for specifying what oozie actions to import"""
   def __init__(self, choices=[], *args, **kwargs):
     super(ImportJobsubDesignForm, self).__init__(*args, **kwargs)
-    self.fields['jobsub_id'] = forms.ChoiceField(choices=choices, widget=forms.RadioSelect(attrs={'class':'radio'}))
+    self.fields['jobsub_id'] = forms.ChoiceField(choices=choices, widget=forms.RadioSelect(attrs={'class': 'radio'}))
 
 
 class NodeForm(forms.ModelForm):
@@ -286,8 +286,8 @@ class SubWorkflowForm(forms.ModelForm):
     user = kwargs.pop('user')
     workflow = kwargs.pop('workflow')
     super(SubWorkflowForm, self).__init__(*args, **kwargs)
-    choices=((wf.id, wf) for wf in Document.objects.available(Workflow, user) if workflow.id != id)
-    self.fields['sub_workflow'] = forms.ChoiceField(choices=choices, required=False, widget=forms.RadioSelect(attrs={'class':'radio'}))
+    choices = ((wf.id, wf) for wf in Document.objects.available(Workflow, user) if workflow.id != id)
+    self.fields['sub_workflow'] = forms.ChoiceField(choices=choices, required=False, widget=forms.RadioSelect(attrs={'class': 'radio'}))
 
   class Meta(object):
     model = SubWorkflow
@@ -353,7 +353,7 @@ class CoordinatorForm(forms.ModelForm):
     model = Coordinator
     exclude = ('owner', 'deployment_dir')
     if hasattr(ENABLE_CRON_SCHEDULING, 'get') and ENABLE_CRON_SCHEDULING.get():
-        exclude += ('frequency_number', 'frequency_unit')
+      exclude += ('frequency_number', 'frequency_unit')
     widgets = {
       'description': forms.TextInput(attrs={'class': 'span5'}),
       'parameters': forms.widgets.HiddenInput(),
@@ -388,7 +388,9 @@ class ImportCoordinatorForm(CoordinatorForm):
                                  required=False)
 
   class Meta(CoordinatorForm.Meta):
-    exclude = ('owner', 'deployment_dir', 'timezone', 'frequency_number', 'frequency_unit', 'schema_version', 'job_properties', 'parameters')
+    exclude = (
+      'owner', 'deployment_dir', 'timezone', 'frequency_number', 'frequency_unit', 'schema_version', 'job_properties', 'parameters'
+    )
 
 
 class DatasetForm(forms.ModelForm):
@@ -419,7 +421,9 @@ class DataInputForm(forms.ModelForm):
     super(DataInputForm, self).__init__(*args, **kwargs)
     self.fields['dataset'].queryset = Dataset.objects.filter(coordinator=coordinator)
     if coordinator.coordinatorworkflow:
-      self.fields['name'].widget = forms.Select(choices=((param, param) for param in set(coordinator.coordinatorworkflow.find_parameters())))
+      self.fields['name'].widget = forms.Select(
+        choices=((param, param) for param in set(coordinator.coordinatorworkflow.find_parameters()))
+      )
 
 
 class DataOutputForm(forms.ModelForm):
@@ -433,7 +437,9 @@ class DataOutputForm(forms.ModelForm):
     super(DataOutputForm, self).__init__(*args, **kwargs)
     self.fields['dataset'].queryset = Dataset.objects.filter(coordinator=coordinator)
     if coordinator.coordinatorworkflow:
-      self.fields['name'].widget = forms.Select(choices=((param, param) for param in set(coordinator.coordinatorworkflow.find_parameters())))
+      self.fields['name'].widget = forms.Select(
+        choices=((param, param) for param in set(coordinator.coordinatorworkflow.find_parameters()))
+      )
 
 
 _node_type_TO_FORM_CLS = {
@@ -481,8 +487,12 @@ class RerunForm(forms.Form):
 
 
 class RerunCoordForm(forms.Form):
-  refresh = forms.BooleanField(initial=True, required=False, help_text=_t("Used to indicate if user wants to refresh an action's input and output events"))
-  nocleanup = forms.BooleanField(initial=True, required=False, help_text=_t('Used to indicate if user wants to cleanup output events for given rerun actions'))
+  refresh = forms.BooleanField(
+    initial=True, required=False, help_text=_t("Used to indicate if user wants to refresh an action's input and output events")
+  )
+  nocleanup = forms.BooleanField(
+    initial=True, required=False, help_text=_t('Used to indicate if user wants to cleanup output events for given rerun actions')
+  )
   actions = forms.MultipleChoiceField(required=True)
   return_json = forms.BooleanField(required=False, widget=forms.HiddenInput)
 
@@ -499,8 +509,12 @@ class RerunCoordForm(forms.Form):
 
 
 class RerunBundleForm(forms.Form):
-  refresh = forms.BooleanField(initial=True, required=False, help_text=_t("Used to indicate if user wants to refresh an action's input and output events"))
-  nocleanup = forms.BooleanField(initial=True, required=False, help_text=_t('Used to indicate if user wants to cleanup output events for given rerun actions'))
+  refresh = forms.BooleanField(
+    initial=True, required=False, help_text=_t("Used to indicate if user wants to refresh an action's input and output events")
+  )
+  nocleanup = forms.BooleanField(
+    initial=True, required=False, help_text=_t('Used to indicate if user wants to cleanup output events for given rerun actions')
+  )
   coordinators = forms.MultipleChoiceField(required=True)
   start = forms.SplitDateTimeField(input_time_formats=[TIME_FORMAT], required=False, initial=datetime.today(),
                                    widget=SplitDateTimeWidget(attrs={'class': 'input-small', 'id': 'rerun_start'},
@@ -547,9 +561,12 @@ class BundleForm(forms.ModelForm):
     }
 
 class UpdateCoordinatorForm(forms.Form):
-  endTime = forms.SplitDateTimeField(label='End Time', input_time_formats=[TIME_FORMAT], required=False, initial=datetime.today() + timedelta(days=3),
-                                 widget=SplitDateTimeWidget(attrs={'class': 'input-small fa fa-calendar', 'id': 'update_endtime'},
-                                                            date_format=DATE_FORMAT, time_format=TIME_FORMAT))
+  endTime = forms.SplitDateTimeField(
+    label='End Time', input_time_formats=[TIME_FORMAT], required=False, initial=datetime.today() + timedelta(days=3),
+    widget=SplitDateTimeWidget(
+      attrs={'class': 'input-small fa fa-calendar', 'id': 'update_endtime'}, date_format=DATE_FORMAT, time_format=TIME_FORMAT
+    )
+  )
 
   pauseTime = forms.SplitDateTimeField(label='Pause Time', input_time_formats=[TIME_FORMAT], required=False, initial=None,
                                  widget=SplitDateTimeWidget(attrs={'class': 'input-small fa fa-calendar', 'id': 'update_pausetime'},

+ 17 - 7
apps/oozie/src/oozie/views/editor.py

@@ -412,7 +412,9 @@ def create_coordinator(request, workflow=None):
     if coordinator_form.is_valid():
       coordinator = coordinator_form.save()
       if enable_cron_scheduling:
-        coordinator.cron_frequency = {'frequency': request.POST.get('cron_frequency'), 'isAdvancedCron': request.POST.get('isAdvancedCron') == 'on'}
+        coordinator.cron_frequency = {
+          'frequency': request.POST.get('cron_frequency'), 'isAdvancedCron': request.POST.get('isAdvancedCron') == 'on'
+        }
       coordinator.save()
       Document.objects.link(coordinator, owner=coordinator.owner, name=coordinator.name, description=coordinator.description)
       return redirect(reverse('oozie:edit_coordinator', kwargs={'coordinator': coordinator.id}) + "#step3")
@@ -507,7 +509,9 @@ def edit_coordinator(request, coordinator):
       new_data_output_formset.save()
       coordinator.sla = json.loads(request.POST.get('sla'))
       if enable_cron_scheduling:
-        coordinator.cron_frequency = {'frequency': strip_tags(request.POST.get('cron_frequency')), 'isAdvancedCron': request.POST.get('isAdvancedCron') == 'on'}
+        coordinator.cron_frequency = {
+          'frequency': strip_tags(request.POST.get('cron_frequency')), 'isAdvancedCron': request.POST.get('isAdvancedCron') == 'on'
+        }
       coordinator.save()
 
       request.info(_('Coordinator saved.'))
@@ -663,7 +667,7 @@ def submit_coordinator(request, coordinator):
 
   popup = render('editor/submit_job_popup.mako', request, {
                  'params_form': params_form,
-                 'action': reverse('oozie:submit_coordinator',  kwargs={'coordinator': coordinator.id})
+                 'action': reverse('oozie:submit_coordinator', kwargs={'coordinator': coordinator.id})
                 }, force_template=True).content
   if not isinstance(popup, str):
     popup = popup.decode('utf-8')
@@ -751,7 +755,9 @@ def restore_bundle(request):
 def edit_bundle(request, bundle):
   history = History.objects.filter(submitter=request.user, job=bundle).order_by('-submission_date')
 
-  BundledCoordinatorFormSet = inlineformset_factory(Bundle, BundledCoordinator, form=BundledCoordinatorForm, max_num=0, can_order=False, can_delete=True)
+  BundledCoordinatorFormSet = inlineformset_factory(
+    Bundle, BundledCoordinator, form=BundledCoordinatorForm, max_num=0, can_order=False, can_delete=True
+  )
   bundle_form = BundleForm(instance=bundle)
 
   if request.method == 'POST':
@@ -785,7 +791,9 @@ def create_bundled_coordinator(request, bundle):
   response = {'status': -1, 'data': 'None'}
 
   if request.method == 'POST':
-    bundled_coordinator_form = BundledCoordinatorForm(request.POST, instance=bundled_coordinator_instance, prefix='create-bundled-coordinator')
+    bundled_coordinator_form = BundledCoordinatorForm(
+      request.POST, instance=bundled_coordinator_instance, prefix='create-bundled-coordinator'
+    )
 
     if bundled_coordinator_form.is_valid():
       bundled_coordinator_form.save()
@@ -820,7 +828,9 @@ def edit_bundled_coordinator(request, bundle, bundled_coordinator):
   response = {'status': -1, 'data': 'None'}
 
   if request.method == 'POST':
-    bundled_coordinator_form = BundledCoordinatorForm(request.POST, instance=bundled_coordinator_instance, prefix='edit-bundled-coordinator')
+    bundled_coordinator_form = BundledCoordinatorForm(
+      request.POST, instance=bundled_coordinator_instance, prefix='edit-bundled-coordinator'
+    )
 
     if bundled_coordinator_form.is_valid():
       bundled_coordinator_form.save()
@@ -874,7 +884,7 @@ def submit_bundle(request, bundle):
 
   popup = render('editor/submit_job_popup.mako', request, {
                  'params_form': params_form,
-                 'action': reverse('oozie:submit_bundle',  kwargs={'bundle': bundle.id})
+                 'action': reverse('oozie:submit_bundle', kwargs={'bundle': bundle.id})
                 }, force_template=True).content
   if not isinstance(popup, str):
     popup = popup.decode('utf-8')