Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(300)

Unified Diff: l2tdevtools/helpers/upload.py

Issue 340120043: [l2tdevtools] Moved reviewer selection functions #255 (Closed)
Patch Set: Changes after review Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « l2tdevtools/helpers/review.py ('k') | tests/helpers/github.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: l2tdevtools/helpers/upload.py
diff --git a/l2tdevtools/helpers/upload.py b/l2tdevtools/helpers/upload.py
index 95f0e6cd9bb37ae62c353513784f44b276c95e78..ecf3032481faf7b75b2f1f259636d0ee7c9e1653 100644
--- a/l2tdevtools/helpers/upload.py
+++ b/l2tdevtools/helpers/upload.py
@@ -6,7 +6,6 @@ from __future__ import unicode_literals
import json
import logging
import os
-import random
import sys
# pylint: disable=import-error,no-name-in-module
@@ -21,52 +20,13 @@ else:
# pylint: disable=wrong-import-position
from l2tdevtools.helpers import cli
+from l2tdevtools.helpers import projects
from l2tdevtools.lib import upload as upload_tool
class UploadHelper(cli.CLIHelper):
"""Codereview upload.py command helper."""
- # yapf: disable
-
- _REVIEWERS_PER_PROJECT = {
- 'dfdatetime': frozenset([
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com']),
- 'dfkinds': frozenset([
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com']),
- 'dfvfs': frozenset([
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com']),
- 'dfwinreg': frozenset([
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com']),
- 'dftimewolf': frozenset([
- 'jberggren@gmail.com',
- 'someguyiknow@google.com',
- 'tomchop@gmail.com']),
- 'l2tpreg': frozenset([
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com']),
- 'plaso': frozenset([
- 'aaronp@gmail.com',
- 'jberggren@gmail.com',
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com',
- 'romaing@google.com'])}
-
- _REVIEWERS_DEFAULT = frozenset([
- 'jberggren@gmail.com',
- 'joachim.metz@gmail.com',
- 'onager@deerpie.com'])
-
- _REVIEWERS_CC = frozenset([
- 'kiddi@kiddaland.net',
- 'log2timeline-dev@googlegroups.com'])
-
- # yapf: enable
-
def __init__(self, email_address, no_browser=False):
"""Initializes a codereview helper.
@@ -83,50 +43,6 @@ class UploadHelper(cli.CLIHelper):
os.path.dirname(__file__), '..', 'lib', 'upload.py')
self._xsrf_token = None
- def _GetReviewer(self, project_name):
- """Determines the reviewer.
-
- Args:
- project_name (str): name of the project.
-
- Returns:
- str: email address of the reviewer that is used on codereview.
- """
- reviewers = list(
- self._REVIEWERS_PER_PROJECT.get(project_name, self._REVIEWERS_DEFAULT))
-
- try:
- reviewers.remove(self._email_address)
- except ValueError:
- pass
-
- random.shuffle(reviewers)
-
- return reviewers[0]
-
- def _GetReviewersOnCC(self, project_name, reviewer):
- """Determines the reviewers on CC.
-
- Args:
- project_name (str): name of the project.
- reviewer (str): email address of the reviewer that is used on codereview.
-
- Returns:
- str: comma separated email addresses.
- """
- reviewers_cc = set(
- self._REVIEWERS_PER_PROJECT.get(project_name, self._REVIEWERS_DEFAULT))
- reviewers_cc.update(self._REVIEWERS_CC)
-
- reviewers_cc.remove(reviewer)
-
- try:
- reviewers_cc.remove(self._email_address)
- except KeyError:
- pass
-
- return ','.join(reviewers_cc)
-
def AddMergeMessage(self, issue_number, message):
"""Adds a merge message to the code review issue.
@@ -235,8 +151,10 @@ class UploadHelper(cli.CLIHelper):
Returns:
int: codereview issue number or None.
"""
- reviewer = self._GetReviewer(project_name)
- reviewers_cc = self._GetReviewersOnCC(project_name, reviewer)
+ reviewer = projects.ProjectsHelper.GetReviewer(
+ project_name, self._email_address)
+ reviewers_cc = projects.ProjectsHelper.GetReviewersOnCC(
+ project_name, self._email_address, reviewer)
command = '{0:s} {1:s} --oauth2'.format(
sys.executable, self._upload_py_path)
« no previous file with comments | « l2tdevtools/helpers/review.py ('k') | tests/helpers/github.py » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b