fromupstream: fix 'cros lint' (pylint) warnings
Ignoring this one, because we're exclusively python3:
contrib/fromupstream.py:1:0: R9100: Missing "from __future__ import print_function" line (missing-print-function)
BUG=none
TEST=pre-upload checks
Change-Id: Iba14d9a9cb03da5a4f1598c7f3746f2e6d0aa3a3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2108790
Tested-by: Brian Norris <briannorris@chromium.org>
Commit-Queue: Brian Norris <briannorris@chromium.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
diff --git a/contrib/fromupstream.py b/contrib/fromupstream.py
index b5b89f1..a0ed1ac 100755
--- a/contrib/fromupstream.py
+++ b/contrib/fromupstream.py
@@ -1,4 +1,6 @@
#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+#
# Copyright 2017 The Chromium OS Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -45,6 +47,7 @@
Similar to subprocess.check_output.
Args:
+ args: subcommand + args passed to 'git'.
stdin: a string or bytes (depending on encoding) that will be passed
to the git subcommand.
encoding: either 'utf-8' (default) or None. Override it to None if