Mercurial Repositories > eric / changeset

--- a/UI/Info.py	Fri Mar 17 19:52:02 2017 +0100
+++ b/UI/Info.py	Sat Mar 18 11:06:48 2017 +0100
@@ -10,8 +10,8 @@
 from __future__ import unicode_literals
 
 Program = 'eric6'
-Version = '@@VERSION@@ (rev. @@REVISION@@)'
-VersionOnly = '@@VERSION@@'
+Version = 'rev_0b335d29dd51 (rev. 0b335d29dd51)'
+VersionOnly = 'rev_0b335d29dd51'
 Copyright = 'Copyright (c) 2002 - 2017 Detlev Offenbach' \
             ' <detlev@die-offenbachs.de>'
 BugAddress = 'eric-bugs@eric-ide.python-projects.org'

--- a/WebBrowser/WebBrowserTabWidget.py	Fri Mar 17 19:52:02 2017 +0100
+++ b/WebBrowser/WebBrowserTabWidget.py	Sat Mar 18 11:06:48 2017 +0100
@@ -199,7 +199,6 @@
             self.__tabContextMenu.addAction(
                 UI.PixmapCache.getIcon("print.png"),
                 self.tr('Print'), self.__tabContextMenuPrint)
-        # TODO: check this on macOS
         if Globals.isLinuxPlatform() or qVersion() >= "5.7.0":
             self.__tabContextMenu.addAction(
                 UI.PixmapCache.getIcon("printPdf.png"),

--- a/WebBrowser/WebBrowserWindow.py	Fri Mar 17 19:52:02 2017 +0100
+++ b/WebBrowser/WebBrowserWindow.py	Sat Mar 18 11:06:48 2017 +0100
@@ -735,7 +735,6 @@
         else:
             self.printAct = None
         
-        # TODO: check this on macOS
         if Globals.isLinuxPlatform() or qVersion() >= "5.7.0":
             self.printPdfAct = E5Action(
                 self.tr('Print as PDF'),

--- a/eric6config.py	Fri Mar 17 19:52:02 2017 +0100
+++ b/eric6config.py	Sat Mar 18 11:06:48 2017 +0100
@@ -1,53 +1,38 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (c) 2002 - 2017 Detlev Offenbach <detlev@die-offenbachs.de>
-#
-
-#
-# This module contains the configuration of the individual eric installation
 #
-
-"""
-Module containing the default configuration of the eric6 installation.
-"""
-
-from __future__ import unicode_literals
-
-import sys
-import os
-
-__ericDir = os.path.dirname(sys.argv[0])
+# This module contains the configuration of the individual eric6 installation
+#
 
 _pkg_config = {
-    'ericDir': __ericDir,
-    'ericPixDir': os.path.join(__ericDir, 'pixmaps'),
-    'ericIconDir': os.path.join(__ericDir, 'icons'),
-    'ericDTDDir': os.path.join(__ericDir, 'DTDs'),
-    'ericCSSDir': os.path.join(__ericDir, 'CSSs'),
-    'ericStylesDir': os.path.join(__ericDir, "Styles"),
-    'ericDocDir': os.path.join(__ericDir, 'Documentation'),
-    'ericExamplesDir': os.path.join(__ericDir, 'Examples'),
-    'ericTranslationsDir': os.path.join(__ericDir, 'i18n'),
-    'ericTemplatesDir': os.path.join(__ericDir, 'DesignerTemplates'),
-    'ericCodeTemplatesDir': os.path.join(__ericDir, 'CodeTemplates'),
-    'ericOthersDir': __ericDir,
-    'bindir': __ericDir,
-    'mdir': __ericDir,
+    'ericDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6',
+    'ericPixDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/pixmaps',
+    'ericIconDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/icons',
+    'ericDTDDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/DTDs',
+    'ericCSSDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/CSSs',
+    'ericStylesDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/Styles',
+    'ericDocDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/Documentation',
+    'ericExamplesDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/Examples',
+    'ericTranslationsDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/i18n',
+    'ericTemplatesDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/DesignerTemplates',
+    'ericCodeTemplatesDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6/CodeTemplates',
+    'ericOthersDir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/eric6',
+    'bindir': r'/Users/detlev/py3qt50env/bin',
+    'mdir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages',
+    'apidir': r'/Users/detlev/py3qt50env/lib/python3.6/site-packages/PyQt5/Qt/qsci/api',
+    'apis': ['zope-2.10.7.api', 'zope-2.11.2.api', 'zope-3.3.1.api', 'eric6.api', 'Ruby-1.8.7.api', 'Ruby-1.9.1.api', 'qss.api'],
+    'macAppBundlePath': r'/Applications',
+    'macAppBundleName': r'eric6.app',
 }
 
-
 def getConfig(name):
-    """
+    '''
     Module function to get a configuration value.
 
-    @param name the name of the configuration value (string).
-    @return requested config value
-    @exception AttributeError raised to indicate an invalid config entry
-    """
+    @param name name of the configuration value (string)
+    '''
     try:
         return _pkg_config[name]
     except KeyError:
         pass
 
-    raise AttributeError(
-        '"{0}" is not a valid configuration value'.format(name))
+    raise AttributeError('"{0}" is not a valid configuration value'.format(name))