Mercurial Repositories > eric / file comparison
comparison: Utilities/__init__.py
Utilities/__init__.py
- changeset 6348
- d6c0b8ab1fc6
- parent 6303
- ec9ebaf206fb
- child 6364
- 6a496f0886ad
equal
deleted
inserted
replaced
| 6347:bcca9eba56a1 | 6348:d6c0b8ab1fc6 |
|---|---|
| 1764 """ | 1764 """ |
| 1765 assert variant in ("1", "2") | 1765 assert variant in ("1", "2") |
| 1766 | 1766 |
| 1767 if isWindowsPlatform(): | 1767 if isWindowsPlatform(): |
| 1768 pysideInterpreters = checkPyside(variant) | 1768 pysideInterpreters = checkPyside(variant) |
| 1769 interpreter = sys.version_info[0] - 2 | 1769 interpreterIndex = sys.version_info[0] - 2 |
| 1770 hasPyside = pysideInterpreters[interpreter] | 1770 hasPyside = pysideInterpreters[interpreterIndex] |
| 1771 # if it isn't the internal interpreter, it has to be the external one | 1771 # if it isn't the internal interpreter, it has to be the external one |
| 1772 if not hasPyside: | 1772 if not hasPyside: |
| 1773 interpreter = not interpreter | 1773 interpreterIndex = not interpreterIndex |
| 1774 if interpreter: | 1774 if interpreterIndex: |
| 1775 prefix = os.path.dirname( | 1775 venvName = Preferences.getDebugger("Python3VirtualEnv") |
| 1776 Preferences.getDebugger("Python3Interpreter")) | |
| 1777 else: | 1776 else: |
| 1778 prefix = os.path.dirname( | 1777 venvName = Preferences.getDebugger("Python2VirtualEnv") |
| 1779 Preferences.getDebugger("PythonInterpreter")) | 1778 interpreter = e5App().getObject("VirtualEnvManager")\ |
| 1779 .getVirtualenvInterpreter(venvName) | |
| 1780 prefix = os.path.dirname(interpreter) | |
| 1780 if toolname in ["pyside-uic", "pyside2-uic"]: | 1781 if toolname in ["pyside-uic", "pyside2-uic"]: |
| 1781 return os.path.join(prefix, "Scripts", toolname + '.exe') | 1782 return os.path.join(prefix, "Scripts", toolname + '.exe') |
| 1782 else: | 1783 else: |
| 1783 return os.path.join( | 1784 return os.path.join( |
| 1784 prefix, "Lib", "site-packages", | 1785 prefix, "Lib", "site-packages", |
| 1807 @rtype tuple of (bool, bool) | 1808 @rtype tuple of (bool, bool) |
| 1808 """ | 1809 """ |
| 1809 assert variant in ("1", "2") | 1810 assert variant in ("1", "2") |
| 1810 | 1811 |
| 1811 pysideInformation = [] | 1812 pysideInformation = [] |
| 1812 for interpreterName in ["PythonInterpreter", "Python3Interpreter"]: | 1813 for venvNameKey in ["Python2VirtualEnv", "Python3VirtualEnv"]: |
| 1813 interpreter = Preferences.getDebugger(interpreterName) | 1814 venvName = Preferences.getDebugger(venvNameKey) |
| 1815 interpreter = e5App().getObject("VirtualEnvManager")\ | |
| 1816 .getVirtualenvInterpreter(venvName) | |
| 1814 if interpreter == "" or not isinpath(interpreter): | 1817 if interpreter == "" or not isinpath(interpreter): |
| 1815 hasPyside = False | 1818 hasPyside = False |
| 1816 else: | 1819 else: |
| 1817 hasPyside = False | 1820 hasPyside = False |
| 1818 checker = os.path.join(getConfig('ericDir'), | 1821 checker = os.path.join(getConfig('ericDir'), |
