Skip to content

Commit

Permalink
OWFeatureStatistics: Pylint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
pavlin-policar committed Oct 23, 2018
1 parent 4b588a2 commit 6032752
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
19 changes: 9 additions & 10 deletions Orange/widgets/data/owfeaturestatistics.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,18 @@
from AnyQt.QtCore import Qt, QSize, QRectF, QVariant, QModelIndex, pyqtSlot, \
QRegExp, QItemSelection, QItemSelectionRange, QItemSelectionModel
from AnyQt.QtGui import QPainter, QColor
from AnyQt.QtWidgets import QStyleOptionViewItem
from AnyQt.QtWidgets import QStyledItemDelegate, QGraphicsScene, QTableView, \
QHeaderView, QStyle
QHeaderView, QStyle, QStyleOptionViewItem # pylint: disable=unused-import

import Orange.statistics.util as ut
from Orange.widgets.report import plural
from Orange.data import Table, StringVariable, DiscreteVariable, \
ContinuousVariable, TimeVariable, Domain, Variable
ContinuousVariable, TimeVariable, Domain, Variable # pylint: disable=unused-import
from Orange.widgets import widget, gui
from Orange.widgets.data.utils.histogram import Histogram
from Orange.widgets.report import plural
from Orange.widgets.settings import ContextSetting, DomainContextHandler
from Orange.widgets.utils.itemmodels import DomainModel, AbstractSortTableModel
from Orange.widgets.utils.signals import Input, Output
from Orange.widgets.data.utils.histogram import Histogram


def _categorical_entropy(x):
Expand Down Expand Up @@ -808,10 +807,10 @@ def __color_var_changed(self, *_):
def _format_variables_string(self, variables):
agg = []
for var_type_name, var_type in [
('categorical', DiscreteVariable),
('numeric', ContinuousVariable),
('time', TimeVariable),
('string', StringVariable)
('categorical', DiscreteVariable),
('numeric', ContinuousVariable),
('time', TimeVariable),
('string', StringVariable)
]:
var_type_list = [v for v in variables if type(v) is var_type]
if var_type_list:
Expand Down Expand Up @@ -889,7 +888,7 @@ def send_report(self):


if __name__ == '__main__':
from AnyQt.QtWidgets import QApplication
from AnyQt.QtWidgets import QApplication # pylint: disable=ungrouped-imports
import sys

app = QApplication(sys.argv)
Expand Down
3 changes: 1 addition & 2 deletions Orange/widgets/data/tests/test_owfeaturestatistics.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from collections import namedtuple
from functools import wraps, partial
from itertools import chain
from typing import Callable, List
from typing import Callable, List # pylint: disable=unused-import

import numpy as np
from AnyQt.QtCore import QItemSelection, QItemSelectionRange, \
Expand Down Expand Up @@ -370,4 +370,3 @@ def test_restores_previous_selection(self):
# Sending back the old data restores the selection
self.send_signal(self.widget.Inputs.data, self.data1)
self.assertEqual(len(self.widget.selected_rows), 2)

18 changes: 10 additions & 8 deletions Orange/widgets/data/utils/histogram.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import numpy as np
from scipy import sparse as sp
from AnyQt.QtCore import Qt, QRectF, QSizeF, QPointF, QLineF
from AnyQt.QtGui import QColor, QBrush, QPen
from AnyQt.QtWidgets import (
QGraphicsWidget,
QGraphicsRectItem,
QGraphicsLinearLayout,
QSizePolicy,
QGraphicsLineItem)
from scipy import sparse as sp
QGraphicsLineItem,
)

import Orange.statistics.util as ut
from Orange.data.util import one_hot
Expand Down Expand Up @@ -213,18 +214,18 @@ def _draw_border(point_1, point_2, border_width, parent):

def _get_histogram_edges(self):
"""Get the edges in the histogram based on the attribute type.
In case of a continuous variable, we split the variable range into
n bins. In case of a discrete variable, bins don't make sense, so we
just return the attribute values.
This will return the staring and ending edge, not just the edges in
between (in the case of a continuous variable).
Returns
-------
np.ndarray
"""
if self.attribute.is_discrete:
return np.array([self.attribute.to_val(v) for v in self.attribute.values])
Expand Down Expand Up @@ -338,7 +339,7 @@ def _draw_histogram(self):
bar_layout.addStretch()
self.__layout.addItem(bar_layout)

bar = ProportionalBarItem(
bar = ProportionalBarItem( # pylint: disable=blacklisted-name
distribution=distr, colors=bin_colors, height=bar_height,
bar_size=bar_size,
)
Expand Down Expand Up @@ -384,8 +385,9 @@ def sizePolicy(self):
if __name__ == '__main__':
import sys
from Orange.data.table import Table
from AnyQt.QtWidgets import QGraphicsView, QGraphicsScene, QApplication, \
QWidget
from AnyQt.QtWidgets import ( # pylint: disable=ungrouped-imports
QGraphicsView, QGraphicsScene, QApplication, QWidget
)

app = QApplication(sys.argv)
widget = QWidget()
Expand Down

0 comments on commit 6032752

Please sign in to comment.