kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

AddonManager: minor bugfix

Browse Source
This commit is contained in:
Yorik van Havre
2018-10-27 16:15:55 -03:00
parent 7fabfde0ef
commit 57726db47f
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Mod/AddonManager/addonmanager_macro.py
View File

@@ -24,8 +24,7 @@
import os
import re
import sys
from freecad import app
import FreeCAD
from addonmanager_utilities import translate
from addonmanager_utilities import urllib2
@@ -57,8 +56,8 @@ class Macro(object):
def is_installed(self):
if self.on_git and not self.src_filename:
return False
return (os.path.exists(os.path.join(app.getUserMacroDir(), self.filename))
or os.path.exists(os.path.join(app.getUserMacroDir(), 'Macro_' + self.filename)))
return (os.path.exists(os.path.join(FreeCAD.getUserMacroDir(), self.filename))
or os.path.exists(os.path.join(FreeCAD.getUserMacroDir(), 'Macro_' + self.filename)))
def fill_details_from_file(self, filename):
with open(filename) as f:
@@ -135,7 +134,7 @@ class Macro(object):
code = sorted(code, key=len)[-1]
code = code.replace('--endl--', '\n')
else:
app.Console.PrintWarning(translate("AddonsInstaller", "Unable to fetch the code of this macro."))
FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "Unable to fetch the code of this macro."))
# Clean HTML escape codes.
try:
from HTMLParser import HTMLParser
@@ -154,7 +153,7 @@ class Macro(object):
if desc:
desc = desc[0]
else:
app.Console.PrintWarning(translate("AddonsInstaller", "Unable to retrieve a description for this macro."))
FreeCAD.Console.PrintWarning(translate("AddonsInstaller", "Unable to retrieve a description for this macro."))
desc = "No description available"
self.desc = desc
self.url = url