Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ekaterina Tuzova
2013-07-22 18:25:37 +04:00
21 changed files with 339 additions and 90 deletions
@@ -288,7 +288,7 @@ public class PyRequirement {
@NotNull
private static List<PyRequirement> parse(@NotNull String s, @Nullable VirtualFile anchor, @NotNull Set<VirtualFile> visited) {
final List<PyRequirement> result = new ArrayList<PyRequirement>();
final Set<PyRequirement> result = new LinkedHashSet<PyRequirement>();
for (String line : StringUtil.splitByLines(s)) {
final String trimmed = line.trim();
if (!trimmed.isEmpty()) {
@@ -301,7 +301,7 @@ public class PyRequirement {
}
}
}
return result;
return new ArrayList<PyRequirement>(result);
}
@NotNull