aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorCristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2021-05-12 14:51:00 +0200
committerCristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io>2021-05-12 20:33:39 +0200
commit06f6395b46492b2be45f9f06f9258f9b31b323e4 (patch)
tree0833daaf85cd28b599269aecc3a22b8c48d69e1c /examples
parentc5db9d63277201ee58829f7eb0656c534d04c249 (diff)
examples: avoid built-in functions names as variable
There were many variable names using built-in python functions so this patch renames them to something safe. Task-number: PYSIDE-841 Change-Id: Iade34711ba31797f08f3f924be05023a7f12d5ef Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/charts/memoryusage/memoryusage.py6
-rw-r--r--examples/macextras/macpasteboardmime/macpasteboardmime.py6
-rw-r--r--examples/opengl/contextinfo/contextinfo.py14
-rw-r--r--examples/remoteobjects/modelview/modelviewserver.py4
-rw-r--r--examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py6
-rw-r--r--examples/widgets/dialogs/classwizard/classwizard.py8
-rw-r--r--examples/widgets/graphicsview/diagramscene/diagramscene.py8
-rw-r--r--examples/widgets/graphicsview/elasticnodes/elasticnodes.py12
-rw-r--r--examples/widgets/itemviews/fetchmore/fetchmore.py6
9 files changed, 35 insertions, 35 deletions
diff --git a/examples/charts/memoryusage/memoryusage.py b/examples/charts/memoryusage/memoryusage.py
index 09655d6fa..384057748 100644
--- a/examples/charts/memoryusage/memoryusage.py
+++ b/examples/charts/memoryusage/memoryusage.py
@@ -111,9 +111,9 @@ class MainWindow(QMainWindow):
for item in memory_usage:
self.series.append(item[0], item[1])
- slice = self.series.slices()[0]
- slice.setExploded()
- slice.setLabelVisible()
+ chart_slice = self.series.slices()[0]
+ chart_slice.setExploded()
+ chart_slice.setLabelVisible()
self.chart = QChart()
self.chart.addSeries(self.series)
self._chart_view = QChartView(self.chart)
diff --git a/examples/macextras/macpasteboardmime/macpasteboardmime.py b/examples/macextras/macpasteboardmime/macpasteboardmime.py
index 4a95ed83c..4e9cc7cc5 100644
--- a/examples/macextras/macpasteboardmime/macpasteboardmime.py
+++ b/examples/macextras/macpasteboardmime/macpasteboardmime.py
@@ -79,10 +79,10 @@ class VCardMime(QtMacExtras.QMacPasteboardMime):
return ""
def convertToMime(self, mime, data, flav):
- all = QtCore.QByteArray()
+ data_all = QtCore.QByteArray()
for i in data:
- all += i
- return all
+ data_all += i
+ return data_all
def convertFromMime(mime, data, flav):
# Todo: implement!
diff --git a/examples/opengl/contextinfo/contextinfo.py b/examples/opengl/contextinfo/contextinfo.py
index 4e2704f1c..47fd83abc 100644
--- a/examples/opengl/contextinfo/contextinfo.py
+++ b/examples/opengl/contextinfo/contextinfo.py
@@ -118,10 +118,10 @@ def print_surface_format(surface_format):
class RenderWindow(QWindow):
- def __init__(self, format):
+ def __init__(self, fmt):
super().__init__()
self.setSurfaceType(QWindow.OpenGLSurface)
- self.setFormat(format)
+ self.setFormat(fmt)
self.context = QOpenGLContext(self)
self.context.setFormat(self.requestedFormat())
if not self.context.create():
@@ -135,14 +135,14 @@ class RenderWindow(QWindow):
self.vao = QOpenGLVertexArrayObject()
self.vbo = QOpenGLBuffer()
- format = self.context.format()
- use_new_style_shader = format.profile() == QSurfaceFormat.CoreProfile
+ fmt = self.context.format()
+ use_new_style_shader = fmt.profile() == QSurfaceFormat.CoreProfile
# Try to handle 3.0 & 3.1 that do not have the core/compatibility profile
# concept 3.2+ has. This may still fail since version 150 (3.2) is
# specified in the sources but it's worth a try.
- if (format.renderableType() == QSurfaceFormat.OpenGL and format.majorVersion() == 3
- and format.minorVersion() <= 1):
- use_new_style_shader = not format.testOption(QSurfaceFormat.DeprecatedFunctions)
+ if (fmt.renderableType() == QSurfaceFormat.OpenGL and fmt.majorVersion() == 3
+ and fmt.minorVersion() <= 1):
+ use_new_style_shader = not fmt.testOption(QSurfaceFormat.DeprecatedFunctions)
vertex_shader = vertex_shader_source if use_new_style_shader else vertex_shader_source_110
fragment_shader = fragment_shader_source if use_new_style_shader else fragment_shader_source_110
diff --git a/examples/remoteobjects/modelview/modelviewserver.py b/examples/remoteobjects/modelview/modelviewserver.py
index ac3acf999..9d0af050e 100644
--- a/examples/remoteobjects/modelview/modelviewserver.py
+++ b/examples/remoteobjects/modelview/modelviewserver.py
@@ -95,7 +95,7 @@ def add_child(num_children, nesting_level):
if __name__ == '__main__':
app = QApplication(sys.argv)
model_size = 100000
- list = []
+ data_list = []
source_model = QStandardItemModel()
horizontal_header_list = ["First Column with spacing",
"Second Column with spacing"]
@@ -109,7 +109,7 @@ if __name__ == '__main__':
first_item.setBackground(Qt.red)
row = [first_item, second_item]
source_model.invisibleRootItem().appendRow(row)
- list.append(f"FancyTextNumber {i}")
+ data_list.append(f"FancyTextNumber {i}")
# Needed by QMLModelViewClient
role_names = {
diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
index 5310a46f0..7a76e8a7c 100644
--- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py
@@ -245,10 +245,10 @@ class BookmarkWidget(QTreeView):
return
dir_path = _config_dir()
native_dir_path = QDir.toNativeSeparators(dir_path)
- dir = QFileInfo(dir_path)
- if not dir.isDir():
+ directory = QFileInfo(dir_path)
+ if not directory.isDir():
print(f'Creating {native_dir_path}...')
- if not QDir(dir.absolutePath()).mkpath(dir.fileName()):
+ if not QDir(directory.absolutePath()).mkpath(directory.fileName()):
warnings.warn(f'Cannot create {native_dir_path}.',
RuntimeWarning)
return
diff --git a/examples/widgets/dialogs/classwizard/classwizard.py b/examples/widgets/dialogs/classwizard/classwizard.py
index 7861bb999..1daf91bbf 100644
--- a/examples/widgets/dialogs/classwizard/classwizard.py
+++ b/examples/widgets/dialogs/classwizard/classwizard.py
@@ -113,7 +113,7 @@ class ClassWizard(QWizard):
def nextId(self):
"""Overrides QWizard.nextId() to insert the property/signal
page in case the class is a QObject."""
- id = self.currentId()
+ idx = self.currentId()
if self.currentId() == self._class_info_index:
qobject = self.field('qobject')
return self._qobject_index if qobject else self._output_index
@@ -371,10 +371,10 @@ class OutputFilesPage(QWizardPage):
return self.output_dir() + '/' + self._file_line_edit.text()
def _choose_output_dir(self):
- dir = QFileDialog.getExistingDirectory(self, "Output Directory",
+ directory = QFileDialog.getExistingDirectory(self, "Output Directory",
self.output_dir())
- if dir:
- self.set_output_dir(dir)
+ if directory:
+ self.set_output_dir(directory)
def validatePage(self):
"""Ensure we do not overwrite existing files."""
diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.py b/examples/widgets/graphicsview/diagramscene/diagramscene.py
index bd3e4a4c3..7588c50a0 100644
--- a/examples/widgets/graphicsview/diagramscene/diagramscene.py
+++ b/examples/widgets/graphicsview/diagramscene/diagramscene.py
@@ -439,16 +439,16 @@ class MainWindow(QMainWindow):
self.scene.update()
self.view.update()
- def button_group_clicked(self, id):
+ def button_group_clicked(self, idx):
buttons = self._button_group.buttons()
for button in buttons:
- if self._button_group.button(id) != button:
+ if self._button_group.button(idx) != button:
button.setChecked(False)
- if id == self.insert_text_button:
+ if idx == self.insert_text_button:
self.scene.set_mode(DiagramScene.InsertText)
else:
- self.scene.set_item_type(id)
+ self.scene.set_item_type(idx)
self.scene.set_mode(DiagramScene.InsertItem)
def delete_item(self):
diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py
index 02a91a06d..78f006285 100644
--- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.py
+++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.py
@@ -58,7 +58,7 @@ def random(boundary):
class Edge(QGraphicsItem):
- type = QGraphicsItem.UserType + 2
+ item_type = QGraphicsItem.UserType + 2
def __init__(self, sourceNode, destNode):
super().__init__()
@@ -73,8 +73,8 @@ class Edge(QGraphicsItem):
self.dest().add_edge(self)
self.adjust()
- def type(self):
- return Edge.type
+ def item_type(self):
+ return Edge.item_type
def source_node(self):
return self.source()
@@ -157,7 +157,7 @@ class Edge(QGraphicsItem):
class Node(QGraphicsItem):
- type = QGraphicsItem.UserType + 1
+ item_type = QGraphicsItem.UserType + 1
def __init__(self, graphWidget):
super().__init__()
@@ -170,8 +170,8 @@ class Node(QGraphicsItem):
self.setCacheMode(self.DeviceCoordinateCache)
self.setZValue(-1)
- def type(self):
- return Node.type
+ def item_type(self):
+ return Node.item_type
def add_edge(self, edge):
self._edge_list.append(weakref.ref(edge))
diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.py b/examples/widgets/itemviews/fetchmore/fetchmore.py
index e496b41f3..92a2b97d4 100644
--- a/examples/widgets/itemviews/fetchmore/fetchmore.py
+++ b/examples/widgets/itemviews/fetchmore/fetchmore.py
@@ -116,11 +116,11 @@ class FileListModel(QAbstractListModel):
@Slot(str)
def set_dir_path(self, path):
self._path = path
- dir = QDir(path)
+ directory = QDir(path)
self.beginResetModel()
- filter = QDir.AllEntries | QDir.NoDot
- self._file_list = dir.entryInfoList(filter, QDir.Name)
+ directory_filter = QDir.AllEntries | QDir.NoDot
+ self._file_list = directory.entryInfoList(directory_filter, QDir.Name)
self._file_count = 0
self.endResetModel()