Skip to content

Commit 3e4fa6a

Browse files
authored
Merge pull request #155 from chennes/fixReferencesToObsoleteVariables
Remove references to obsolete variables
2 parents 49d1cc4 + 05c76a0 commit 3e4fa6a

File tree

3 files changed

+1
-19
lines changed

3 files changed

+1
-19
lines changed

Widgets/addonmanager_widget_package_details_view.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -321,11 +321,7 @@ def _get_update_status_string(self) -> str:
321321
def _there_are_warnings_to_show(self) -> bool:
322322
if self.disabled:
323323
return True
324-
if (
325-
self.warning_flags.obsolete
326-
or self.warning_flags.python2
327-
or self.warning_flags.required_freecad_version
328-
):
324+
if self.warning_flags.required_freecad_version:
329325
return True
330326
return False # TODO: Someday support optional warnings on license types
331327

@@ -336,10 +332,6 @@ def _get_warning_string(self) -> str:
336332
"WARNING: This addon is currently installed, but disabled. Use the 'enable' "
337333
"button to re-enable.",
338334
)
339-
if self.warning_flags.obsolete:
340-
return translate("AddonsInstaller", "WARNING: This addon is obsolete")
341-
if self.warning_flags.python2:
342-
return translate("AddonsInstaller", "WARNING: This addon is Python 2 only")
343335
if self.warning_flags.required_freecad_version:
344336
return translate("AddonsInstaller", "WARNING: This addon requires FreeCAD {}").format(
345337
self.warning_flags.required_freecad_version

addonmanager_package_details_controller.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,6 @@ def show_repo(self, repo: Addon) -> None:
146146

147147
flags = WarningFlags()
148148
flags.required_freecad_version = self.requires_newer_freecad()
149-
flags.obsolete = repo.obsolete
150-
flags.python2 = repo.python2
151149
self.ui.set_warning_flags(flags)
152150
self.set_change_branch_button_state()
153151

package_list.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -651,14 +651,6 @@ def filterAcceptsRow(self, row, _parent=QtCore.QModelIndex()):
651651
license_manager = get_license_manager()
652652
if data.status() == Addon.Status.NOT_INSTALLED:
653653

654-
# If it's not installed, check to see if it's Py2 only
655-
if self.hide_py2 and data.python2:
656-
return False
657-
658-
# If it's not installed, check to see if it's marked obsolete
659-
if self.hide_obsolete and data.obsolete:
660-
return False
661-
662654
if self.hide_unlicensed:
663655
if not data.license or data.license in ["UNLICENSED", "UNLICENCED"]:
664656
fci.Console.PrintLog(f"Hiding {data.name} because it has no license set\n")

0 commit comments

Comments
 (0)