openstack/nova
Code Issues Proposed changes

Merge "Fix hacking.py naivete regarding lines that look like imports"

Browse Source
This commit is contained in:
Jenkins
2012-10-26 19:52:59 +00:00
committed by Gerrit Code Review
parent 1d8225bbb2 88f252a3d4
commit 33825bea5b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/hacking.py
View File

@@ -105,7 +105,7 @@ def import_normalize(line):
# convert "from x import y" to "import x.y" # convert "from x import y" to "import x.y"
# handle "from x import y as z" to "import x.y as z" # handle "from x import y as z" to "import x.y as z"
split_line = line.split() split_line = line.split()
if (line.startswith("from ") and "," not in line and if ("import" in line and line.startswith("from ") and "," not in line and
split_line[2] == "import" and split_line[3] != "*" and split_line[2] == "import" and split_line[3] != "*" and
split_line[1] != "__future__" and split_line[1] != "__future__" and
(len(split_line) == 4 or (len(split_line) == 4 or