python3: App/ Gui FreeCADInit.py + New style module #602

looooo · 2017-03-08T21:16:23Z

first step towards new-style modules

make FreeCADInit.py and FreeCADGuiInit.py python3 compatible
use FreeCAD.__ModDirs__ instead of FreeCAD.__path__ for storing the module directory names
set FreeCAD.__path__ to ModDir, Lib64Dir, LibDir
add ModDir, Lib64Dir, LibDir before the Modules get initialized. (This allows to import the a module from the Init.py via __init__.py

looooo · 2017-03-09T09:08:38Z

please wait with merging. I think there is missing one additional directory... currently testing...

…eCAD to the base directories, which contain all the modules

FreeCAD._newStyleModule("MyMod") # removes MyMod from the sys.path

…CAD import Mod or old style

looooo · 2017-03-10T09:03:51Z

if ci's succeed this ready to merge from my side.

luzpaz · 2017-03-13T14:34:29Z

Please change the title of the bug so it associates with the mantis ticket 995
Per the mantisbt admin here is how you can associate github commits with mantisbt tickets:
By default, regex /(?:bugs?|issues?|reports?)+\s*:?\s+(?:#(?:\d+)[,\.\s]*)+/i will link issues
and
/(?:fixe?d?s?|resolved?s?)+\s*:?\s+(?:#(?:\d+)[,\.\s]*)+/i will mark them as resolved too

looooo · 2017-03-14T08:58:50Z

The PR is only partially related to python3. I didn't want to do work twice, so the python3 changes for these files are included.

yorikvanhavre · 2017-03-15T13:51:43Z

Looks good to me... I'll wait for @wwmayer to have a look

simonvanderveldt · 2017-03-15T16:53:29Z

src/App/FreeCADInit.py

@@ -33,10 +33,25 @@
 # imports the one and only
 import FreeCAD

+def removeFromPath(module_name):


I might be misunderstanding things, but it seems like this function isn't really used anywhere (except on line 49)? So I guess this can be removed?

it's not used yet. Modules which want to use from FreeCAD import module can place the function in the Init.py. please read this thread: https://forum.freecadweb.org/viewtopic.php?f=10&t=21128

simonvanderveldt · 2017-03-15T16:58:38Z

src/App/FreeCADInit.py

+					# XXX: This looks scary securitywise...
+
+					with open(InstallFile) as f:
+						exec(f.read())


If you're just trying to import a module here, you can just use importlib.import_module()

This is not about modules. it's about the freecad Init for a package. I also thought of an alternative, but somehow it wasn't working when I tried it. Don't remember the problem.

wwmayer · 2017-03-18T17:49:23Z

Merged.

@oscilococcinum

Fixes FreeCAD#602 @oscilococcinum

@lev-blit

4.5.0 - 2023-10-07 Features requirements-txt-fixer: also sort constraints.txt by default. FreeCAD#857 PR by @lev-blit. FreeCAD#830 issue by @PLPeeters. debug-statements: add bpdb debugger. FreeCAD#942 PR by @mwip. FreeCAD#941 issue by @mwip. Fixes file-contents-sorter: fix sorting an empty file. FreeCAD#944 PR by @RoelAdriaans. FreeCAD#935 issue by @paduszyk. double-quote-string-fixer: don't rewrite inside f-strings in 3.12+. FreeCAD#973 PR by @asottile. FreeCAD#971 issue by @XuehaiPan. Migrating now requires python >= 3.8. FreeCAD#926 PR by @asottile. FreeCAD#927 PR by @asottile. 4.4.0 - 2022-11-23 Features forbid-submodules: new hook which outright bans submodules. FreeCAD#815 PR by @asottile. FreeCAD#707 issue by @ChiefGokhlayeh. 4.3.0 - 2022-06-07 Features check-executables-have-shebangs: use git config core.fileMode to determine if it should query git. FreeCAD#730 PR by @Kurt-von-Laven. name-tests-test: add --pytest-test-first test convention. FreeCAD#779 PR by @asottile. Fixes check-shebang-scripts-are-executable: update windows instructions. FreeCAD#774 PR by @mdeweerd. FreeCAD#770 issue by @mdeweerd. check-toml: use stdlib tomllib when available. FreeCAD#771 PR by @DanielNoord. FreeCAD#755 issue by @sognetic. check-added-large-files: don't run on non-file stages. FreeCAD#778 PR by @asottile. FreeCAD#777 issue by @skyj. 4.2.0 - 2022-04-06 Features name-tests-test: updated display text. FreeCAD#713 PR by @asottile. check-docstring-first: make output more parsable. FreeCAD#748 PR by @asottile. check-merge-conflict: make output more parsable. FreeCAD#748 PR by @asottile. debug-statements: make output more parsable. FreeCAD#748 PR by @asottile. Fixes check-merge-conflict: fix detection of ====== conflict marker on windows. FreeCAD#748 PR by @asottile. Updating Drop python<3.7. FreeCAD#719 PR by @asottile. Changed default branch from master to main. FreeCAD#744 PR by @asottile. 4.1.0 - 2021-12-22 Features debug-statements: add pdbr debugger. FreeCAD#614 PR by @cansarigol. detect-private-key: add detection for additional key types. FreeCAD#658 PR by @ljmf00. check-executables-have-shebangs: improve messaging on windows. FreeCAD#689 PR by @pujitm. FreeCAD#686 issue by @jmerdich. check-added-large-files: support --enforce-all with git-lfs. FreeCAD#674 PR by @amartani. FreeCAD#560 issue by @jeremy-coulon. Fixes check-case-conflict: improve performance. FreeCAD#626 PR by @guykisel. FreeCAD#625 issue by @guykisel. forbid-new-submodules: fix false-negatives for pre-push. FreeCAD#619 PR by @m-khvoinitsky. FreeCAD#609 issue by @m-khvoinitsky. check-merge-conflict: fix execution in git worktrees. FreeCAD#662 PR by @errsyn. FreeCAD#638 issue by @daschuer. Misc. Normalize case of hook names and descriptions. FreeCAD#671 PR by @dennisroche. FreeCAD#673 PR by @revolter. 4.0.1 - 2021-05-16 Fixes check-shebang-scripts-are-executable fix entry point. FreeCAD#602 issue by @Person-93. FreeCAD#603 PR by @scop. 4.0.0 - 2021-05-14 Features check-json: report duplicate keys. FreeCAD#558 PR by @AdityaKhursale. FreeCAD#554 issue by @adamchainz. no-commit-to-branch: add main to default blocked branches. FreeCAD#565 PR by @ndevenish. check-case-conflict: check conflicts in directory names as well. FreeCAD#575 PR by @slsyy. FreeCAD#70 issue by @andyjack. check-vcs-permalinks: forbid other branch names. FreeCAD#582 PR by @jack1142. FreeCAD#581 issue by @jack1142. check-shebang-scripts-are-executable: new hook which ensures shebang'd scripts are executable. FreeCAD#545 PR by @scop. Fixes check-executables-have-shebangs: Short circuit shebang lookup on windows. FreeCAD#544 PR by @scop. requirements-txt-fixer: Fix comments which have indentation FreeCAD#549 PR by @greshilov. FreeCAD#548 issue by @greshilov. pretty-format-json: write to stdout using UTF-8 encoding. FreeCAD#571 PR by @jack1142. FreeCAD#570 issue by @jack1142. Use more inclusive language. FreeCAD#599 PR by @asottile. Breaking changes Remove deprecated hooks: flake8, pyflakes, autopep8-wrapper. FreeCAD#597 PR by @asottile.

@lev-blit

4.5.0 - 2023-10-07 Features requirements-txt-fixer: also sort constraints.txt by default. #857 PR by @lev-blit. #830 issue by @PLPeeters. debug-statements: add bpdb debugger. #942 PR by @mwip. #941 issue by @mwip. Fixes file-contents-sorter: fix sorting an empty file. #944 PR by @RoelAdriaans. #935 issue by @paduszyk. double-quote-string-fixer: don't rewrite inside f-strings in 3.12+. #973 PR by @asottile. #971 issue by @XuehaiPan. Migrating now requires python >= 3.8. #926 PR by @asottile. #927 PR by @asottile. 4.4.0 - 2022-11-23 Features forbid-submodules: new hook which outright bans submodules. #815 PR by @asottile. #707 issue by @ChiefGokhlayeh. 4.3.0 - 2022-06-07 Features check-executables-have-shebangs: use git config core.fileMode to determine if it should query git. #730 PR by @Kurt-von-Laven. name-tests-test: add --pytest-test-first test convention. #779 PR by @asottile. Fixes check-shebang-scripts-are-executable: update windows instructions. #774 PR by @mdeweerd. #770 issue by @mdeweerd. check-toml: use stdlib tomllib when available. #771 PR by @DanielNoord. #755 issue by @sognetic. check-added-large-files: don't run on non-file stages. #778 PR by @asottile. #777 issue by @skyj. 4.2.0 - 2022-04-06 Features name-tests-test: updated display text. #713 PR by @asottile. check-docstring-first: make output more parsable. #748 PR by @asottile. check-merge-conflict: make output more parsable. #748 PR by @asottile. debug-statements: make output more parsable. #748 PR by @asottile. Fixes check-merge-conflict: fix detection of ====== conflict marker on windows. #748 PR by @asottile. Updating Drop python<3.7. #719 PR by @asottile. Changed default branch from master to main. #744 PR by @asottile. 4.1.0 - 2021-12-22 Features debug-statements: add pdbr debugger. #614 PR by @cansarigol. detect-private-key: add detection for additional key types. #658 PR by @ljmf00. check-executables-have-shebangs: improve messaging on windows. #689 PR by @pujitm. #686 issue by @jmerdich. check-added-large-files: support --enforce-all with git-lfs. #674 PR by @amartani. #560 issue by @jeremy-coulon. Fixes check-case-conflict: improve performance. #626 PR by @guykisel. #625 issue by @guykisel. forbid-new-submodules: fix false-negatives for pre-push. #619 PR by @m-khvoinitsky. #609 issue by @m-khvoinitsky. check-merge-conflict: fix execution in git worktrees. #662 PR by @errsyn. #638 issue by @daschuer. Misc. Normalize case of hook names and descriptions. #671 PR by @dennisroche. #673 PR by @revolter. 4.0.1 - 2021-05-16 Fixes check-shebang-scripts-are-executable fix entry point. #602 issue by @Person-93. #603 PR by @scop. 4.0.0 - 2021-05-14 Features check-json: report duplicate keys. #558 PR by @AdityaKhursale. #554 issue by @adamchainz. no-commit-to-branch: add main to default blocked branches. #565 PR by @ndevenish. check-case-conflict: check conflicts in directory names as well. #575 PR by @slsyy. #70 issue by @andyjack. check-vcs-permalinks: forbid other branch names. #582 PR by @jack1142. #581 issue by @jack1142. check-shebang-scripts-are-executable: new hook which ensures shebang'd scripts are executable. #545 PR by @scop. Fixes check-executables-have-shebangs: Short circuit shebang lookup on windows. #544 PR by @scop. requirements-txt-fixer: Fix comments which have indentation #549 PR by @greshilov. #548 issue by @greshilov. pretty-format-json: write to stdout using UTF-8 encoding. #571 PR by @jack1142. #570 issue by @jack1142. Use more inclusive language. #599 PR by @asottile. Breaking changes Remove deprecated hooks: flake8, pyflakes, autopep8-wrapper. #597 PR by @asottile.

looooo added 5 commits March 9, 2017 12:18

py3: App: FreeCADInit.py

1e6a2d9

py3: Gui: FreeCADGuiInit.py

4d79382

use __ModDirs__ for module directories and set the search path of Fre…

95eb43b

…eCAD to the base directories, which contain all the modules

App: FreeCADInit.py: remove unused import + add local Mod dir

b9f4f88

App: FreeCADInit.py: add newStyleModule function

3d21dc0

FreeCAD._newStyleModule("MyMod") # removes MyMod from the sys.path

looooo force-pushed the new_style_module branch from d069c45 to 3d21dc0 Compare March 9, 2017 11:43

App: FreeCADInit.py: force downstream modules to use either from Free…

1a030b1

…CAD import Mod or old style

looooo mentioned this pull request Mar 13, 2017

merging python3 looooo/FreeCAD#8

Closed

58 tasks

looooo changed the title ~~New style module~~ python3: App/ Gui FreeCADInit.py + New style module Mar 14, 2017

simonvanderveldt reviewed Mar 15, 2017

View reviewed changes

wwmayer closed this Mar 18, 2017

looooo mentioned this pull request Apr 8, 2017

Namespace-packages #679

Closed

looooo deleted the new_style_module branch December 12, 2017 20:20

kwahoo2 pushed a commit to kwahoo2/FreeCAD that referenced this pull request Mar 22, 2023

PartDesign: fix multi-wire Loft

53dcbde

Fixes FreeCAD#602 @oscilococcinum

mosfet80 mentioned this pull request Dec 14, 2023

Update .pre-commit-config.yaml #11730

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

python3: App/ Gui FreeCADInit.py + New style module #602

python3: App/ Gui FreeCADInit.py + New style module #602

looooo commented Mar 8, 2017

looooo commented Mar 9, 2017

looooo commented Mar 10, 2017

luzpaz commented Mar 13, 2017 •

edited

Loading

looooo commented Mar 14, 2017 •

edited

Loading

yorikvanhavre commented Mar 15, 2017

simonvanderveldt Mar 15, 2017 •

edited

Loading

looooo Mar 15, 2017

simonvanderveldt Mar 15, 2017 •

edited

Loading

looooo Mar 15, 2017

wwmayer commented Mar 18, 2017

python3: App/ Gui FreeCADInit.py + New style module #602

python3: App/ Gui FreeCADInit.py + New style module #602

Conversation

looooo commented Mar 8, 2017

looooo commented Mar 9, 2017

looooo commented Mar 10, 2017

luzpaz commented Mar 13, 2017 • edited Loading

looooo commented Mar 14, 2017 • edited Loading

yorikvanhavre commented Mar 15, 2017

simonvanderveldt Mar 15, 2017 • edited Loading

Choose a reason for hiding this comment

looooo Mar 15, 2017

Choose a reason for hiding this comment

simonvanderveldt Mar 15, 2017 • edited Loading

Choose a reason for hiding this comment

looooo Mar 15, 2017

Choose a reason for hiding this comment

wwmayer commented Mar 18, 2017

luzpaz commented Mar 13, 2017 •

edited

Loading

looooo commented Mar 14, 2017 •

edited

Loading

simonvanderveldt Mar 15, 2017 •

edited

Loading

simonvanderveldt Mar 15, 2017 •

edited

Loading