<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Oct 9, 2016 at 6:22 PM, Brian Gesiak via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: modocache<br>
Date: Sun Oct 9 20:22:06 2016<br>
New Revision: 283710<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=283710&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=283710&view=rev</a><br>
Log:<br>
[lit] Remove (or allow specific) unused imports<br>
<br>
Summary:<br>
Using Python linter flake8 on the utils/lit reveals several linter<br>
warnings designated "F401: Unused import". Fix or silence these<br>
warnings.<br>
<br>
Some of these unused imports are legitimate, while some are part of lit's API.<br>
For example, users of lit expect to be able to access `lit.formats.ShTest` in<br>
their `lit.cfg`, despite the module hierarchy for that symbol actually being<br>
`lit.formats.shtest.ShTest`. To silence linter errors for these lines,<br>
include a "noqa" directive.<br>
<br>
Reviewers: echristo, delcypher, beanz, ddunbar<br>
<br>
Subscribers: mehdi_amini, llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D25407" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D25407</a><br>
<br>
Modified:<br>
llvm/trunk/utils/lit/lit.py<br>
llvm/trunk/utils/lit/lit/<wbr>LitConfig.py<br>
llvm/trunk/utils/lit/lit/__<wbr>init__.py<br>
llvm/trunk/utils/lit/lit/<wbr>formats/__init__.py<br>
<br>
Modified: llvm/trunk/utils/lit/lit.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit.py?rev=283710&r1=283709&r2=283710&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit.py?rev=283710&r1=283709&<wbr>r2=283710&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit.py (original)<br>
+++ llvm/trunk/utils/lit/lit.py Sun Oct 9 20:22:06 2016<br>
@@ -1,5 +1,6 @@<br>
#!/usr/bin/env python<br>
<br>
+from lit.main import main<br>
+<br>
if __name__=='__main__':<br>
- import lit<br>
- lit.main()<br>
+ main()<br>
<br>
Modified: llvm/trunk/utils/lit/lit/<wbr>LitConfig.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/LitConfig.py?rev=283710&r1=283709&r2=283710&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit/LitConfig.py?rev=283710&<wbr>r1=283709&r2=283710&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit/<wbr>LitConfig.py (original)<br>
+++ llvm/trunk/utils/lit/lit/<wbr>LitConfig.py Sun Oct 9 20:22:06 2016<br>
@@ -83,7 +83,7 @@ class LitConfig(object):<br>
# a timeout per test. Check it's available.<br>
# See lit.util.<wbr>killProcessAndChildren()<br>
try:<br>
- import psutil<br>
+ import psutil # noqa: F401<br>
except ImportError:<br>
self.fatal("Setting a timeout per test requires the"<br>
" Python psutil module but it could not be"<br>
<br>
Modified: llvm/trunk/utils/lit/lit/__<wbr>init__.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/__init__.py?rev=283710&r1=283709&r2=283710&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit/__init__.py?rev=283710&r1=<wbr>283709&r2=283710&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit/__<wbr>init__.py (original)<br>
+++ llvm/trunk/utils/lit/lit/__<wbr>init__.py Sun Oct 9 20:22:06 2016<br>
@@ -1,8 +1,5 @@<br>
"""'lit' Testing Tool"""<br>
<br>
-from __future__ import absolute_import<br>
-from .main import main<br>
-<br>
__author__ = 'Daniel Dunbar'<br>
__email__ = '<a href="mailto:daniel@minormatter.com">daniel@minormatter.com</a>'<br>
__versioninfo__ = (0, 6, 0)<br></blockquote><div><br></div><div>This change breaks the built llvm-lit.py on (at least) Windows x86-64 Python 3.4.1</div><div><br></div><div><div>$ /e/Build/xxx/Debug/bin/llvm-lit.py -v ELF</div><div>Traceback (most recent call last):</div><div> File "E:/Build/xxx/Debug/bin/llvm-lit.py", line 44, in <module></div><div> lit.main(builtin_parameters)</div><div>AttributeError: 'module' object has no attribute 'main'</div></div><div><br></div><div>- Michael Spencer<br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
Modified: llvm/trunk/utils/lit/lit/<wbr>formats/__init__.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/formats/__init__.py?rev=283710&r1=283709&r2=283710&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/llvm/trunk/utils/lit/<wbr>lit/formats/__init__.py?rev=<wbr>283710&r1=283709&r2=283710&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/utils/lit/lit/<wbr>formats/__init__.py (original)<br>
+++ llvm/trunk/utils/lit/lit/<wbr>formats/__init__.py Sun Oct 9 20:22:06 2016<br>
@@ -1,4 +1,8 @@<br>
-from __future__ import absolute_import<br>
-from lit.formats.base import TestFormat, FileBasedTest, OneCommandPerFileTest<br>
-from lit.formats.googletest import GoogleTest<br>
-from lit.formats.shtest import ShTest<br>
+from lit.formats.base import ( # noqa: F401<br>
+ TestFormat,<br>
+ FileBasedTest,<br>
+ OneCommandPerFileTest<br>
+)<br>
+<br>
+from lit.formats.googletest import GoogleTest # noqa: F401<br>
+from lit.formats.shtest import ShTest # noqa: F401<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>