mozreview: fix flake8 errors (
bug 1232700); r?smacleod
This fixes the following errors:
F401 <module> imported but unused
F821 undefined name <name>
F841 local variable <name> is assigned to but never used
MozReview-Commit-ID: 83OyT2HJCvm
--- a/pylib/mozreview/mozreview/autoland/resources.py
+++ b/pylib/mozreview/mozreview/autoland/resources.py
@@ -220,17 +220,17 @@ class AutolandTriggerResource(BaseAutola
finally:
if autoland_request_id is None:
release_lock(lock_id)
return AUTOLAND_ERROR, {
'status_code': response.status_code,
'request_id': None,
}
- autoland_request = AutolandRequest.objects.create(
+ AutolandRequest.objects.create(
autoland_id=autoland_request_id,
push_revision=last_revision,
repository_url=target_repository,
review_request_id=rr.id,
user_id=request.user.id,
)
AutolandEventLogEntry.objects.create(
@@ -370,17 +370,17 @@ class TryAutolandTriggerResource(BaseAut
finally:
if autoland_request_id is None:
release_lock(lock_id)
return AUTOLAND_ERROR, {
'status_code': response.status_code,
'request_id': None,
}
- autoland_request = AutolandRequest.objects.create(
+ AutolandRequest.objects.create(
autoland_id=autoland_request_id,
push_revision=last_revision,
repository_url=target_repository,
review_request_id=rr.id,
user_id=request.user.id,
extra_data=json.dumps({
'try_syntax': try_syntax
})
@@ -661,23 +661,20 @@ class ImportPullRequestTriggerResource(W
return AUTOLAND_ERROR, {
'status_code': response.status_code,
'message': response.json().get('error'),
}
# We succeeded in scheduling the job.
try:
request_id = int(response.json()['request_id'])
- except KeyError, ValueError:
- return AUTOLAND_ERROR, {
- 'status_code': response.status_code,
- 'request_id': autoland_request_id,
- }
+ except (KeyError, ValueError):
+ return AUTOLAND_ERROR, {'status_code': response.status_code}
- import_pullrequest_request = ImportPullRequestRequest.objects.create(
+ ImportPullRequestRequest.objects.create(
autoland_id=request_id,
github_user=github_user,
github_repo=github_repo,
github_pullrequest=pullrequest,
)
AutolandEventLogEntry.objects.create(
status=AutolandEventLogEntry.REQUESTED,
--- a/pylib/mozreview/mozreview/decorators.py
+++ b/pylib/mozreview/mozreview/decorators.py
@@ -1,8 +1,10 @@
+import logging
+
from djblets.util.decorators import simple_decorator
from djblets.webapi.decorators import (_find_httprequest,
webapi_decorator,
webapi_login_required,
webapi_response_errors)
from djblets.webapi.errors import PERMISSION_DENIED
--- a/pylib/mozreview/mozreview/fields.py
+++ b/pylib/mozreview/mozreview/fields.py
@@ -3,19 +3,18 @@ from __future__ import unicode_literals
import json
import logging
from django.template.defaultfilters import linebreaksbr
from django.template.loader import Context, get_template
from django.utils.safestring import mark_safe
from django.utils.translation import ugettext as _
-from reviewboard.extensions.base import get_extension_manager
from reviewboard.reviews.fields import BaseReviewRequestField
-from reviewboard.reviews.models import ReviewRequest, ReviewRequestDraft
+from reviewboard.reviews.models import ReviewRequestDraft
from mozreview.autoland.models import AutolandEventLogEntry, AutolandRequest
from mozreview.extra_data import (
BASE_COMMIT_KEY,
COMMIT_ID_KEY,
COMMITS_KEY,
fetch_commit_data,
gen_child_rrs,
@@ -340,19 +339,16 @@ class FileDiffReviewerField(BaseReviewRe
"""
# RB validation requires this to be unique, so we fake a field id
field_id = "p2rb.FileDiffReviewerField"
label = ""
def as_html(self):
user = self.request.user
file_diff_reviewer_list = []
- reviewer_ids = self.review_request_details.target_people.values_list(
- 'id', flat=True
- )
if (user.is_authenticated() and
isinstance(self.review_request_details, ReviewRequest)):
diffsets = self.review_request_details.get_diffsets()
# Merge all the FileDiffs together
files = sum([list(diff.files.all()) for diff in diffsets], [])
for item in files:
--- a/pylib/mozreview/mozreview/hostingservice/hmo_repository.py
+++ b/pylib/mozreview/mozreview/hostingservice/hmo_repository.py
@@ -1,10 +1,8 @@
-import logging
-
from django import forms
from django.utils.translation import ugettext_lazy as _
from reviewboard.hostingsvcs.forms import HostingServiceForm
from reviewboard.hostingsvcs.service import HostingService
class HMORepositoryForm(HostingServiceForm):
--- a/pylib/mozreview/mozreview/middleware.py
+++ b/pylib/mozreview/mozreview/middleware.py
@@ -1,9 +1,9 @@
-from mozreview.models import get_profile, MozReviewUserProfile
+from mozreview.models import get_profile
class MozReviewUserProfileMiddleware(object):
"""Fetch the MozReviewUserProfile and attach it to the request object."""
def process_request(self, request):
if not request.user.is_authenticated():
request.mozreview_profile = None
--- a/pylib/mozreview/mozreview/models.py
+++ b/pylib/mozreview/mozreview/models.py
@@ -1,13 +1,12 @@
from __future__ import unicode_literals
from django.contrib.auth.models import User
from django.db import models
-from reviewboard.diffviewer.models import FileDiff
from mozreview.autoland.models import (
AutolandEventLogEntry,
AutolandRequest
)
from mozreview.bugzilla.models import (
BugzillaUserMap,
get_bugzilla_api_key,
--- a/pylib/mozreview/mozreview/tests/test-autoland-concurrent.py
+++ b/pylib/mozreview/mozreview/tests/test-autoland-concurrent.py
@@ -1,24 +1,20 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, unicode_literals
-import time
import unittest
import requests
import selenium.webdriver.support.expected_conditions as EC
-from selenium.common.exceptions import (ElementNotVisibleException,
- NoSuchElementException,
- StaleElementReferenceException)
+from selenium.common.exceptions import StaleElementReferenceException
from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
from selenium.webdriver.support.wait import WebDriverWait
from vcttesting.unittest import MozReviewWebDriverTest
def get_treestatus_login_token(treestatus_url, user, password):
r = requests.get(treestatus_url + '/login', allow_redirects=False,
--- a/pylib/mozreview/mozreview/tests/test-autoland-try.py
+++ b/pylib/mozreview/mozreview/tests/test-autoland-try.py
@@ -2,21 +2,19 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, unicode_literals
import time
import selenium.webdriver.support.expected_conditions as EC
-from selenium.common.exceptions import (ElementNotVisibleException,
- NoSuchElementException,
+from selenium.common.exceptions import (NoSuchElementException,
StaleElementReferenceException)
from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
from selenium.webdriver.support.wait import WebDriverWait
from vcttesting.unittest import MozReviewWebDriverTest
class AutolandTryTest(MozReviewWebDriverTest):
@classmethod
def setUpClass(cls):
--- a/pylib/mozreview/mozreview/tests/test-import-pullrequest.py
+++ b/pylib/mozreview/mozreview/tests/test-import-pullrequest.py
@@ -24,17 +24,17 @@ class ImportPullrequestTest(MozReviewWeb
self = cls('run')
self.create_users([
('mjane@example.com', 'password2', 'Mary Jane [:mary]'),
])
self.create_ldap(b'mjane@example.com', b'mjane', 2001,
b'Mary Jane')
- lr = self.create_basic_repo('mjane@example.com', 'mjane')
+ self.create_basic_repo('mjane@example.com', 'mjane')
except Exception:
MozReviewWebDriverTest.tearDownClass()
raise
def test_import_pullrequest(self):
self.reviewboard_login('mjane@example.com', 'password2')
self.load_rburl('import-pullrequest/dminor/gecko-dev/1')
--- a/pylib/mozreview/mozreview/tests/test-reviewer-selection.py
+++ b/pylib/mozreview/mozreview/tests/test-reviewer-selection.py
@@ -3,17 +3,16 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, unicode_literals
import time
import selenium.webdriver.support.expected_conditions as EC
from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
from selenium.webdriver.support.wait import WebDriverWait
from vcttesting.unittest import MozReviewWebDriverTest
class AutocompleteTest(MozReviewWebDriverTest):
def test_reviewer_autocomplete(self):
@@ -52,17 +51,16 @@ class AutocompleteTest(MozReviewWebDrive
reviewers = self.browser.find_elements_by_class_name(
'mozreview-child-reviewer-list')
self.assertEqual(len(reviewers), 2)
self.assertEqual(reviewers[0].text, 'jsmith')
self.assertEqual(reviewers[1].text, '')
# Here we test that adding the same reviewer to a different commit
# works as expected.
- children = self.browser.find_element_by_id('mozreview-child-requests')
WebDriverWait(self.browser, 10).until(
EC.presence_of_element_located(
(By.CLASS_NAME, 'mozreview-child-reviewer-list')))
self.assign_reviewer(1, 'jsmith')
time.sleep(1)
publish = self.browser.find_element_by_id('btn-draft-publish')
--- a/pylib/mozreview/mozreview/tests/test-reviewer-specification.py
+++ b/pylib/mozreview/mozreview/tests/test-reviewer-specification.py
@@ -1,19 +1,16 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from __future__ import absolute_import, unicode_literals
-import time
-
import selenium.webdriver.support.expected_conditions as EC
from selenium.webdriver.common.by import By
-from selenium.webdriver.common.keys import Keys
from selenium.webdriver.support.wait import WebDriverWait
from vcttesting.unittest import MozReviewWebDriverTest
class ReviewerSpecificationTest(MozReviewWebDriverTest):
def test_reviewer_specification(self):
# This tests whether or not it's possible to specify a review in the