[pitivi] Fix pylint redefined-builtin
- From: Thibault Saunier <tsaunier src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pitivi] Fix pylint redefined-builtin
- Date: Mon, 11 Nov 2019 22:06:45 +0000 (UTC)
commit c613ca15b7d3625c58a08b0ddc4853f573214b3e
Author: Alexandru Băluț <alexandru balut gmail com>
Date: Tue Oct 29 18:28:04 2019 +0100
Fix pylint redefined-builtin
pitivi/editorperspective.py | 6 +--
pitivi/effects.py | 14 +++---
pitivi/mediafilespreviewer.py | 12 +++---
pitivi/medialibrary.py | 28 ++++++------
pitivi/render.py | 4 +-
pitivi/transitions.py | 8 ++--
pitivi/utils/loggable.py | 99 +++++++++++++++++++++----------------------
pitivi/utils/misc.py | 4 +-
pitivi/utils/validate.py | 5 +--
pitivi/utils/widgets.py | 12 ++----
pre-commit.hook | 4 --
tests/test_log.py | 8 ++--
12 files changed, 96 insertions(+), 108 deletions(-)
---
diff --git a/pitivi/editorperspective.py b/pitivi/editorperspective.py
index 53c634d6..9ac8fbb6 100644
--- a/pitivi/editorperspective.py
+++ b/pitivi/editorperspective.py
@@ -772,10 +772,10 @@ class EditorPerspective(Perspective, Loggable):
chooser.props.do_overwrite_confirmation = True
formats = {_("PNG image"): ["image/png", ("png",)],
_("JPEG image"): ["image/jpeg", ("jpg", "jpeg")]}
- for format in formats:
+ for image_format in formats:
filt = Gtk.FileFilter()
- filt.set_name(format)
- filt.add_mime_type(formats.get(format)[0])
+ filt.set_name(image_format)
+ filt.add_mime_type(formats.get(image_format)[0])
chooser.add_filter(filt)
response = chooser.run()
if response == Gtk.ResponseType.OK:
diff --git a/pitivi/effects.py b/pitivi/effects.py
index 613985d1..d08ba13d 100644
--- a/pitivi/effects.py
+++ b/pitivi/effects.py
@@ -391,7 +391,7 @@ class EffectListWidget(Gtk.Box, Loggable):
# Create the filter for searching the storemodel.
self.model_filter = self.storemodel.filter_new()
- self.model_filter.set_visible_func(self._setRowVisible, data=None)
+ self.model_filter.set_visible_func(self._set_row_visible_func, data=None)
self.view = Gtk.TreeView(model=self.model_filter)
self.view.props.headers_visible = False
@@ -586,16 +586,16 @@ class EffectListWidget(Gtk.Box, Loggable):
def _search_entry_icon_press_cb(self, entry, icon_pos, event):
entry.set_text("")
- def _setRowVisible(self, model, iter, unused_data):
- if not self._effectType == model.get_value(iter, COL_EFFECT_TYPE):
+ def _set_row_visible_func(self, model, model_iter, data):
+ if not self._effectType == model.get_value(model_iter, COL_EFFECT_TYPE):
return False
- if model.get_value(iter, COL_EFFECT_CATEGORIES) is None:
+ if model.get_value(model_iter, COL_EFFECT_CATEGORIES) is None:
return False
- if self.categoriesWidget.get_active_text() not in model.get_value(iter, COL_EFFECT_CATEGORIES):
+ if self.categoriesWidget.get_active_text() not in model.get_value(model_iter, COL_EFFECT_CATEGORIES):
return False
text = self.searchEntry.get_text().lower()
- return text in model.get_value(iter, COL_DESC_TEXT).lower() or\
- text in model.get_value(iter, COL_NAME_TEXT).lower()
+ return text in model.get_value(model_iter, COL_DESC_TEXT).lower() or\
+ text in model.get_value(model_iter, COL_NAME_TEXT).lower()
PROPS_TO_IGNORE = ['name', 'qos', 'silent', 'message', 'parent']
diff --git a/pitivi/mediafilespreviewer.py b/pitivi/mediafilespreviewer.py
index 09d43bba..d7f7b464 100644
--- a/pitivi/mediafilespreviewer.py
+++ b/pitivi/mediafilespreviewer.py
@@ -424,19 +424,19 @@ class PreviewWidget(Gtk.Grid, Loggable):
def _append_tag(self, taglist, tag, tags):
if tag in ACCEPTABLE_TAGS:
- name = Gst.tag_get_nick(tag)
- type = Gst.tag_get_type(tag)
+ tag_name = Gst.tag_get_nick(tag)
+ tag_type = Gst.tag_get_type(tag)
type_getters = {GObject.TYPE_STRING: 'get_string',
GObject.TYPE_DOUBLE: 'get_double',
GObject.TYPE_FLOAT: 'get_float',
GObject.TYPE_INT: 'get_int',
GObject.TYPE_UINT: 'get_uint'}
- if type in type_getters:
- res, value = getattr(taglist, type_getters[type])(tag)
+ if tag_type in type_getters:
+ res, value = getattr(taglist, type_getters[tag_type])(tag)
assert res
- if not type == GObject.TYPE_STRING:
+ if not tag_type == GObject.TYPE_STRING:
value = str(value)
- tags[name] = value
+ tags[tag_name] = value
def _tag_found_cb(self, unused_bus, message):
tag_list = message.parse_tag()
diff --git a/pitivi/medialibrary.py b/pitivi/medialibrary.py
index a85797b3..1ac3b370 100644
--- a/pitivi/medialibrary.py
+++ b/pitivi/medialibrary.py
@@ -561,7 +561,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
# Use this instead of using self.storemodel directly
self.modelFilter = self.storemodel.filter_new()
self.modelFilter.set_visible_func(
- self._setRowVisible, data=searchEntry)
+ self._set_row_visible_func, data=searchEntry)
# TreeView
# Displays icon, name, type, length
@@ -805,7 +805,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
elif self.clip_view == SHOW_ICONVIEW:
self.iconview.grab_focus()
- def _setRowVisible(self, model, iter, data):
+ def _set_row_visible_func(self, model, model_iter, data):
"""Toggles the visibility of a liststore row."""
text = data.get_text().lower()
if not text:
@@ -813,7 +813,7 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
return True
# We must convert to markup form to be able to search for &, ', etc.
text = GLib.markup_escape_text(text)
- return text in model.get_value(iter, COL_INFOTEXT).lower()
+ return text in model.get_value(model_iter, COL_INFOTEXT).lower()
def _connectToProject(self, project):
"""Connects signal handlers to the specified project."""
@@ -879,17 +879,16 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
dialog.connect('update-preview', previewer.update_preview_cb)
# Filter for the "known good" formats by default
- filter = Gtk.FileFilter()
- filter.set_name(_("Supported file formats"))
- filter.add_custom(Gtk.FileFilterFlags.URI |
- Gtk.FileFilterFlags.MIME_TYPE,
- self._filter_unsupported)
+ file_filter = Gtk.FileFilter()
+ file_filter.set_name(_("Supported file formats"))
+ file_filter.add_custom(Gtk.FileFilterFlags.URI | Gtk.FileFilterFlags.MIME_TYPE,
+ self._filter_unsupported)
for formatter in GES.list_assets(GES.Formatter):
for extension in formatter.get_meta("extension").split(","):
if not extension:
continue
- filter.add_pattern("*.%s" % extension)
- dialog.add_filter(filter)
+ file_filter.add_pattern("*.%s" % extension)
+ dialog.add_filter(file_filter)
# ...and allow the user to override our whitelists
default = Gtk.FileFilter()
@@ -1074,16 +1073,15 @@ class MediaLibraryWidget(Gtk.Box, Loggable):
self.__removeAsset(asset)
self._addAsset(asset)
- def _errorCreatingAssetCb(self, unused_project, error, id, type):
+ def _errorCreatingAssetCb(self, unused_project, error, asset_id, extractable_type):
"""Gathers asset loading errors."""
- if GObject.type_is_a(type, GES.UriClip):
- if self.app.proxy_manager.is_proxy_asset(id):
+ if GObject.type_is_a(extractable_type, GES.UriClip):
+ if self.app.proxy_manager.is_proxy_asset(asset_id):
self.debug("Error %s with a proxy"
", not showing the error message", error)
return
- error = (id, str(error.domain), error)
- self._errors.append(error)
+ self._errors.append((asset_id, str(error.domain), error))
def _startImporting(self):
self.__last_proxying_estimate_time = _("Unknown")
diff --git a/pitivi/render.py b/pitivi/render.py
index a9d89953..12149843 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -965,8 +965,8 @@ class RenderDialog(Loggable):
self.window.show() # Show the rendering dialog again
def _disconnectFromGst(self):
- for obj, id in self._gstSigId.items():
- obj.disconnect(id)
+ for obj, handler_id in self._gstSigId.items():
+ obj.disconnect(handler_id)
self._gstSigId = {}
try:
self.project.pipeline.disconnect_by_func(self._updatePositionCb)
diff --git a/pitivi/transitions.py b/pitivi/transitions.py
index ac1297c6..a87d45f1 100644
--- a/pitivi/transitions.py
+++ b/pitivi/transitions.py
@@ -262,7 +262,7 @@ class TransitionsListWidget(Gtk.Box, Loggable):
trans_asset.icon])
# Now that the UI is fully ready, enable searching
- self.model_filter.set_visible_func(self._setRowVisible, data=None)
+ self.model_filter.set_visible_func(self._set_row_visible_func, data=None)
# Alphabetical/name sorting instead of based on the ID number
self.storemodel.set_sort_column_id(
COL_NAME_TEXT, Gtk.SortType.ASCENDING)
@@ -353,8 +353,8 @@ class TransitionsListWidget(Gtk.Box, Loggable):
return None
return self.model_filter[path[0]][COL_TRANSITION_ASSET]
- def _setRowVisible(self, model, iter, unused_data):
+ def _set_row_visible_func(self, model, model_iter, data):
"""Filters the icon view to show only the search results."""
text = self.search_entry.get_text().lower()
- return text in model.get_value(iter, COL_DESC_TEXT).lower() or\
- text in model.get_value(iter, COL_NAME_TEXT).lower()
+ return text in model.get_value(model_iter, COL_DESC_TEXT).lower() or\
+ text in model.get_value(model_iter, COL_NAME_TEXT).lower()
diff --git a/pitivi/utils/loggable.py b/pitivi/utils/loggable.py
index f1a1a095..d50706d5 100644
--- a/pitivi/utils/loggable.py
+++ b/pitivi/utils/loggable.py
@@ -436,21 +436,21 @@ def getFormatArgs(startFormat, startArgs, endFormat, endArgs, args, kwargs):
for items in list(kwargs.items()):
debugArgs.extend(items)
debugArgs.extend(endArgs)
- format = startFormat \
+ fmt = startFormat \
+ ', '.join(('%s', ) * len(args)) \
+ (kwargs and ', ' or '') \
+ ', '.join(('%s=%r', ) * len(kwargs)) \
+ endFormat
- return format, debugArgs
+ return fmt, debugArgs
-def doLog(level, object, category, message, args, where=-1, filePath=None, line=None):
+def doLog(level, obj, category, message, args, where=-1, filePath=None, line=None):
"""Logs something.
Args:
level (int): Debug level.
- object (str): Object converted to str.
- category (str): Category such as the name of the object's class.
+ obj (str): Object converted to str.
+ category (str): Category such as the name of the obj's class.
message (str): The message to log.
args (list): The args to apply to the message, if any.
where (int or function): What to log file and line number for;
@@ -487,7 +487,7 @@ def doLog(level, object, category, message, args, where=-1, filePath=None, line=
message = "\033[00m\033[32;01m%s:\033[00m %s" % (funcname, message)
for handler in handlers:
try:
- handler(level, object, category, filePath, line, message)
+ handler(level, obj, category, filePath, line, message)
except TypeError as e:
raise SystemError("handler %r raised a TypeError: %s" % (
handler, getExceptionMessage(e)))
@@ -495,55 +495,55 @@ def doLog(level, object, category, message, args, where=-1, filePath=None, line=
return ret
-def errorObject(object, cat, format, *args):
+def errorObject(obj, cat, fmt, *args):
"""Logs a fatal error message in the specified category.
This will also raise a `SystemExit`.
"""
- doLog(ERROR, object, cat, format, args)
+ doLog(ERROR, obj, cat, fmt, args)
-def warningObject(object, cat, format, *args):
+def warningObject(obj, cat, fmt, *args):
"""Logs a warning message in the specified category.
This is used for non-fatal problems.
"""
- doLog(WARN, object, cat, format, args)
+ doLog(WARN, obj, cat, fmt, args)
-def fixmeObject(object, cat, format, *args):
+def fixmeObject(obj, cat, fmt, *args):
"""Logs a fixme message in the specified category.
This is used for not implemented codepaths or known issues in the code.
"""
- doLog(FIXME, object, cat, format, args)
+ doLog(FIXME, obj, cat, fmt, args)
-def infoObject(object, cat, format, *args):
+def infoObject(obj, cat, fmt, *args):
"""Logs an informational message in the specified category."""
- doLog(INFO, object, cat, format, args)
+ doLog(INFO, obj, cat, fmt, args)
-def debugObject(object, cat, format, *args):
+def debugObject(obj, cat, fmt, *args):
"""Logs a debug message in the specified category."""
- doLog(DEBUG, object, cat, format, args)
+ doLog(DEBUG, obj, cat, fmt, args)
-def logObject(object, cat, format, *args):
+def logObject(obj, cat, fmt, *args):
"""Logs a log message.
Used for debugging recurring events.
"""
- doLog(LOG, object, cat, format, args)
+ doLog(LOG, obj, cat, fmt, args)
-def safeprintf(file, format, *args):
+def safeprintf(file, fmt, *args):
"""Writes to a file object, ignoring errors."""
try:
if args:
- file.write(format % args)
+ file.write(fmt % args)
else:
- file.write(format)
+ file.write(fmt)
except IOError as e:
if e.errno == errno.EPIPE:
# if our output is closed, exit; e.g. when logging over an
@@ -553,7 +553,7 @@ def safeprintf(file, format, *args):
# otherwise ignore it, there's nothing you can do
-def printHandler(level, object, category, file, line, message):
+def printHandler(level, obj, category, file, line, message):
"""Writes to stderr.
The output will be different depending the value of "_enableCrackOutput";
@@ -561,8 +561,8 @@ def printHandler(level, object, category, file, line, message):
Args:
level (str): The debug level.
- object (Optional[str]): The object the message is about, or None.
- category (str): Category such as the name of the object's class.
+ obj (Optional[str]): The object the message is about, or None.
+ category (str): Category such as the name of the obj's class.
file (str): The source file where the message originates.
line (int): The line number in the file where the message originates.
message (str): The message to be logged.
@@ -578,11 +578,11 @@ def printHandler(level, object, category, file, line, message):
if not _enableCrackOutput:
safeprintf(_outfile, '%s %-8s %-17s %-2s %s %s\n',
getFormattedLevelName(level), time.strftime("%H:%M:%S"),
- category, object, message, where)
+ category, obj, message, where)
else:
o = ""
- if object:
- o = '"' + object + '"'
+ if obj:
+ o = '"' + obj + '"'
# level pid object cat time
# 5 + 1 + 7 + 1 + 32 + 1 + 17 + 1 + 15 == 80
safeprintf(
@@ -595,8 +595,8 @@ def printHandler(level, object, category, file, line, message):
def logLevelName(level):
- format = '%-5s'
- return format % (_LEVEL_NAMES[level - 1], )
+ fmt = '%-5s'
+ return fmt % (_LEVEL_NAMES[level - 1], )
def _preformatLevels(enableColorOutput):
@@ -716,7 +716,7 @@ def addLogHandler(func):
Args:
func (function): A function object with prototype
- (level, object, category, message) where level is either
+ (level, obj, category, message) where level is either
ERROR, WARN, INFO, DEBUG, or LOG, and the rest of the arguments are
strings or None. Use getLevelName(level) to get a printable name
for the log level.
@@ -738,7 +738,7 @@ def addLimitedLogHandler(func):
Args:
func (function): A function object with prototype
- (level, object, category, message) where level is either
+ (level, obj, category, message) where level is either
ERROR, WARN, INFO, DEBUG, or LOG, and the rest of the arguments are
strings or None. Use getLevelName(level) to get a printable name
for the log level.
@@ -773,28 +773,28 @@ def removeLimitedLogHandler(func):
# public log functions
-def error(cat, format, *args):
- errorObject(None, cat, format, *args)
+def error(cat, fmt, *args):
+ errorObject(None, cat, fmt, *args)
-def warning(cat, format, *args):
- warningObject(None, cat, format, *args)
+def warning(cat, fmt, *args):
+ warningObject(None, cat, fmt, *args)
-def fixme(cat, format, *args):
- fixmeObject(None, cat, format, *args)
+def fixme(cat, fmt, *args):
+ fixmeObject(None, cat, fmt, *args)
-def info(cat, format, *args):
- infoObject(None, cat, format, *args)
+def info(cat, fmt, *args):
+ infoObject(None, cat, fmt, *args)
-def debug(cat, format, *args):
- debugObject(None, cat, format, *args)
+def debug(cat, fmt, *args):
+ debugObject(None, cat, fmt, *args)
-def log(cat, format, *args):
- logObject(None, cat, format, *args)
+def log(cat, fmt, *args):
+ logObject(None, cat, fmt, *args)
# public utility functions
@@ -949,7 +949,7 @@ class BaseLoggable:
logObject(self.logObjectName(),
self.logCategory, *self.logFunction(*args))
- def doLog(self, level, where, format, *args, **kwargs):
+ def doLog(self, level, where, fmt, *args, **kwargs):
"""Logs a message at the specified level.
Args:
@@ -957,8 +957,8 @@ class BaseLoggable:
where (int or function): How many frames to go back from
the last log frame, must be negative; or a function
(to log for a future call).
- format (str): The string template for the message.
- *args: The arguments used when converting the `format`
+ fmt (str): The string template for the message.
+ *args: The arguments used when converting the `fmt`
string template to the message.
**kwargs: The pre-calculated values from a previous doLog call.
@@ -970,7 +970,7 @@ class BaseLoggable:
return {}
args = self.logFunction(*args)
return doLog(level, self.logObjectName(), self.logCategory,
- format, args, where=where, **kwargs)
+ fmt, args, where=where, **kwargs)
def logFunction(self, *args):
"""Processes the arguments applied to the message template.
@@ -981,7 +981,6 @@ class BaseLoggable:
def logObjectName(self):
"""Gets the name of this object."""
- # cheat pychecker
for name in ['logName', 'name']:
if hasattr(self, name):
return getattr(self, name)
@@ -1006,8 +1005,8 @@ class Loggable(BaseLoggable):
return "<%s at 0x%x>" % (self.__class__.__name__, id(self))
return res
- def error(self, format, *args):
+ def error(self, fmt, *args):
if _canShortcutLogging(self.logCategory, ERROR):
return
doLog(ERROR, self.logObjectName(), self.logCategory,
- format, self.logFunction(*args), where=-2)
+ fmt, self.logFunction(*args), where=-2)
diff --git a/pitivi/utils/misc.py b/pitivi/utils/misc.py
index 004783c3..155aec18 100644
--- a/pitivi/utils/misc.py
+++ b/pitivi/utils/misc.py
@@ -237,8 +237,8 @@ def hash_file(uri):
return sha256.hexdigest()
-def quantize(input, interval):
- return (input // interval) * interval
+def quantize(value, interval):
+ return (value // interval) * interval
def show_user_manual(page=None):
diff --git a/pitivi/utils/validate.py b/pitivi/utils/validate.py
index 8e0ed7af..508500b7 100644
--- a/pitivi/utils/validate.py
+++ b/pitivi/utils/validate.py
@@ -66,12 +66,11 @@ def Event(event_type, **kwargs):
if GstValidate:
class PitiviMonitor(GstValidate.Monitor):
- def __init__(self, runner, object):
- GstValidate.Monitor.__init__(self, object=object, validate_runner=runner)
+ def __init__(self, runner, obj):
+ GstValidate.Monitor.__init__(self, object=obj, validate_runner=runner)
if GstValidate:
try:
- import gi
gi.require_version('Wnck', '3.0')
from gi.repository import Wnck
Wnck.Screen.get_default().connect("window-opened", self._window_opened_cb)
diff --git a/pitivi/utils/widgets.py b/pitivi/utils/widgets.py
index f2a4e740..f2f9b377 100644
--- a/pitivi/utils/widgets.py
+++ b/pitivi/utils/widgets.py
@@ -373,15 +373,11 @@ class FractionWidget(TextWidget, DynamicWidget):
"^([0-9]*(\.[0-9]+)?)(([:/][0-9]*(\.[0-9]+)?)|M)?$")
__gtype_name__ = 'FractionWidget'
- def __init__(self, range=None, presets=None, default=None):
+ def __init__(self, presets=None, default=None):
DynamicWidget.__init__(self, default)
- if range:
- flow = float(range.low)
- fhigh = float(range.high)
- else:
- flow = float("-Infinity")
- fhigh = float("Infinity")
+ flow = float("-Infinity")
+ fhigh = float("Infinity")
choices = []
if presets:
for preset in presets:
@@ -1102,7 +1098,7 @@ class GstElementSettingsWidget(Gtk.Box, Loggable):
widget = ChoiceWidget(choices, default=prop.default_value)
elif type_name == "GstFraction":
widget = FractionWidget(
- None, presets=["0:1"], default=prop.default_value)
+ presets=["0:1"], default=prop.default_value)
else:
# TODO: implement widgets for: GBoxed, GFlags
self.fixme("Unsupported property type: %s", type_name)
diff --git a/pre-commit.hook b/pre-commit.hook
index 81db31dd..da94fee4 100755
--- a/pre-commit.hook
+++ b/pre-commit.hook
@@ -14,9 +14,7 @@ export PYTHONPATH=$TOPLEVEL/pitivi/coptimizations/.libs:$PYTHONPATH
PYLINT_IGNORED_FILES="
bin/pitivi.in
pitivi/autoaligner.py
-pitivi/editorperspective.py
pitivi/effects.py
-pitivi/mediafilespreviewer.py
pitivi/medialibrary.py
pitivi/preset.py
pitivi/project.py
@@ -25,7 +23,6 @@ pitivi/settings.py
pitivi/timeline/elements.py
pitivi/timeline/timeline.py
pitivi/titleeditor.py
-pitivi/transitions.py
pitivi/undo/timeline.py
pitivi/utils/extract.py
pitivi/utils/loggable.py
@@ -39,7 +36,6 @@ pitivi/viewer/move_scale_overlay.py
pitivi/viewer/overlay_stack.py
pitivi/viewer/viewer.py
tests/common.py
-tests/test_log.py
tests/test_medialibrary.py
tests/test_preset.py
tests/test_project.py
diff --git a/tests/test_log.py b/tests/test_log.py
index a28a7707..58233baf 100644
--- a/tests/test_log.py
+++ b/tests/test_log.py
@@ -29,8 +29,8 @@ class LogTester(log.Loggable):
class LogFunctionTester(log.Loggable):
- def logFunction(self, format, *args):
- return (("override " + format), ) + args[1:]
+ def logFunction(self, fmt, *args):
+ return (("override " + fmt), ) + args[1:]
class TestWithHandler(unittest.TestCase):
@@ -46,9 +46,9 @@ class TestWithHandler(unittest.TestCase):
# we want to remove the default handler so it doesn't show up stuff
log.reset()
- def handler(self, level, object, category, file, line, message):
+ def handler(self, level, obj, category, file, line, message):
self.level = level
- self.object = object
+ self.object = obj
self.category = category
self.file = file
self.line = line
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]