mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyfax: get rid of import * (2)

Browse Source 
Change-Id: Ibd988812d96f7f539c1e888be9ee25c0c895f358
Reviewed-on: https://gerrit.libreoffice.org/686
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Xisco Fauli
2012-09-23 15:58:45 +02:00
committed by Michael Stahl
parent dbdca385fc
commit 90c128e090
11 changed files with 40 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wizards/com/sun/star/wizards/common/ConfigGroup.py
View File

@@ -15,9 +15,8 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
import traceback
import inspect import inspect
from .ConfigNode import * from .ConfigNode import ConfigNode
from .Configuration import Configuration from .Configuration import Configuration
class ConfigGroup(ConfigNode): class ConfigGroup(ConfigNode):

12
wizards/com/sun/star/wizards/common/Desktop.py
View File

@@ -17,7 +17,7 @@
# #
import uno import uno
import traceback import traceback
from .NoValidPathException import * from .NoValidPathException import NoValidPathException
from com.sun.star.frame.FrameSearchFlag import ALL, PARENT from com.sun.star.frame.FrameSearchFlag import ALL, PARENT
from com.sun.star.util import URL from com.sun.star.util import URL
@@ -67,7 +67,7 @@ class Desktop(object):
xDispatch = xFrame.queryDispatch(oURLArray[0], _stargetframe, ALL) xDispatch = xFrame.queryDispatch(oURLArray[0], _stargetframe, ALL)
return xDispatch return xDispatch
except Exception, e: except Exception, e:
e.printStackTrace(System.out) traceback.print_exc()
return None return None
@@ -75,7 +75,7 @@ class Desktop(object):
def connect(self, connectStr): def connect(self, connectStr):
localContext = uno.getComponentContext() localContext = uno.getComponentContext()
resolver = localContext.ServiceManager.createInstanceWithContext( resolver = localContext.ServiceManager.createInstanceWithContext(
"com.sun.star.bridge.UnoUrlResolver", localContext) "com.sun.star.bridge.UnoUrlResolver", localContext)
ctx = resolver.resolve( connectStr ) ctx = resolver.resolve( connectStr )
orb = ctx.ServiceManager orb = ctx.ServiceManager
return orb return orb
@@ -111,7 +111,7 @@ class Desktop(object):
_sString, 0, _aLocale, nStartFlags, "", nStartFlags, " ") _sString, 0, _aLocale, nStartFlags, "", nStartFlags, " ")
return aResult.EndPos return aResult.EndPos
except Exception, e: except Exception, e:
e.printStackTrace(System.out) traceback.print_exc()
return -1 return -1
@classmethod @classmethod
@@ -204,8 +204,8 @@ class OfficePathRetriever:
try: try:
xPathSubst = xMSF.createInstance( xPathSubst = xMSF.createInstance(
"com.sun.star.util.PathSubstitution") "com.sun.star.util.PathSubstitution")
except com.sun.star.uno.Exception, e: except Exception, e:
e.printStackTrace() traceback.print_exc()
if xPathSubst != None: if xPathSubst != None:
return xPathSubst return xPathSubst

3
wizards/com/sun/star/wizards/fax/CGFax.py
View File

@@ -15,8 +15,7 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
from ..common.ConfigGroup import * from ..common.ConfigGroup import ConfigGroup
from ..common.ConfigGroup import *
class CGFax(ConfigGroup): class CGFax(ConfigGroup):

3
wizards/com/sun/star/wizards/fax/CGFaxWizard.py
View File

@@ -16,8 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
from .CGFax import CGFax from .CGFax import CGFax
from ..common.ConfigGroup import * from ..common.ConfigGroup import ConfigGroup
from ..common.ConfigGroup import *
class CGFaxWizard(ConfigGroup): class CGFaxWizard(ConfigGroup):

1
wizards/com/sun/star/wizards/fax/CallWizard.py
View File

@@ -15,7 +15,6 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
import uno
import unohelper import unohelper
import traceback import traceback

4
wizards/com/sun/star/wizards/fax/FaxDocument.py
View File

@@ -15,7 +15,9 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
from ..text.TextDocument import *
from ..text.TextDocument import TextDocument, traceback, Helper,\
TextFieldHandler, Configuration
from ..text.TextSectionHandler import TextSectionHandler from ..text.TextSectionHandler import TextSectionHandler
from ..common.PropertyNames import PropertyNames from ..common.PropertyNames import PropertyNames

17
wizards/com/sun/star/wizards/fax/FaxWizardDialog.py
View File

@@ -15,13 +15,10 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
import uno
from .FaxWizardDialogResources import FaxWizardDialogResources from .FaxWizardDialogResources import FaxWizardDialogResources
from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN from .FaxWizardDialogConst import FaxWizardDialogConst, HIDMAIN
from ..ui.WizardDialog import WizardDialog from ..ui.WizardDialog import WizardDialog, uno, Helper, UIConsts, \
from ..ui.UIConsts import UIConsts PropertyNames
from ..common.Helper import Helper
from ..common.PropertyNames import PropertyNames
from com.sun.star.awt.FontUnderline import SINGLE from com.sun.star.awt.FontUnderline import SINGLE
@@ -72,11 +69,11 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH), PropertyNames.PROPERTY_WIDTH),
(8, FaxWizardDialogConst.OPTBUSINESSFAX_HID, (8, FaxWizardDialogConst.OPTBUSINESSFAX_HID,
self.resources.resoptBusinessFax_value, 97, 28, 1, 1, 184), self.resources.resoptBusinessFax_value, 97, 28, 1, 1, 184),
self) self)
self.lstBusinessStyle = self.insertListBox("lstBusinessStyle", self.lstBusinessStyle = self.insertListBox("lstBusinessStyle",
FaxWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED, FaxWizardDialogConst.LSTBUSINESSSTYLE_ACTION_PERFORMED,
FaxWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED, FaxWizardDialogConst.LSTBUSINESSSTYLE_ITEM_CHANGED,
("Dropdown", PropertyNames.PROPERTY_HEIGHT, ("Dropdown", PropertyNames.PROPERTY_HEIGHT,
PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_HELPURL,
@@ -97,7 +94,7 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH), PropertyNames.PROPERTY_WIDTH),
(8, FaxWizardDialogConst.OPTPRIVATEFAX_HID, (8, FaxWizardDialogConst.OPTPRIVATEFAX_HID,
self.resources.resoptPrivateFax_value,97, 81, 1, 2, 184), self) self.resources.resoptPrivateFax_value,97, 81, 1, 2, 184), self)
self.lstPrivateStyle = self.insertListBox("lstPrivateStyle", self.lstPrivateStyle = self.insertListBox("lstPrivateStyle",
FaxWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED, FaxWizardDialogConst.LSTPRIVATESTYLE_ACTION_PERFORMED,
@@ -151,10 +148,10 @@ class FaxWizardDialog(WizardDialog):
PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_STEP,
PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_TABINDEX,
PropertyNames.PROPERTY_WIDTH), PropertyNames.PROPERTY_WIDTH),
(39, self.resources.reslblIntroduction_value, (39, self.resources.reslblIntroduction_value,
True, 104, 145, 1, 55, 199)) True, 104, 145, 1, 55, 199))
self.ImageControl3 = self.insertInfoImage(92, 145, 1) self.ImageControl3 = self.insertInfoImage(92, 145, 1)
def buildStep2(self): def buildStep2(self):
self.chkUseLogo = self.insertCheckBox("chkUseLogo", self.chkUseLogo = self.insertCheckBox("chkUseLogo",
FaxWizardDialogConst.CHKUSELOGO_ITEM_CHANGED, FaxWizardDialogConst.CHKUSELOGO_ITEM_CHANGED,

12
wizards/com/sun/star/wizards/fax/FaxWizardDialogImpl.py
View File

@@ -15,18 +15,24 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
from .FaxWizardDialog import * import traceback
from .CGFaxWizard import * from .FaxWizardDialog import FaxWizardDialog, Helper, PropertyNames, uno
from .FaxDocument import * from .CGFaxWizard import CGFaxWizard
from .FaxDocument import FaxDocument
from .FaxWizardDialogConst import HID from .FaxWizardDialogConst import HID
from ..ui.PathSelection import PathSelection from ..ui.PathSelection import PathSelection
from ..ui.event.UnoDataAware import UnoDataAware from ..ui.event.UnoDataAware import UnoDataAware
from ..ui.event.RadioDataAware import RadioDataAware from ..ui.event.RadioDataAware import RadioDataAware
from ..text.TextFieldHandler import TextFieldHandler from ..text.TextFieldHandler import TextFieldHandler
from ..text.TextDocument import TextDocument
from ..text.ViewHandler import ViewHandler
from ..common.Configuration import Configuration
from ..common.SystemDialog import SystemDialog from ..common.SystemDialog import SystemDialog
from ..common.NoValidPathException import NoValidPathException from ..common.NoValidPathException import NoValidPathException
from ..common.HelpIds import HelpIds from ..common.HelpIds import HelpIds
from ..common.FileAccess import FileAccess from ..common.FileAccess import FileAccess
from ..common.Desktop import Desktop
from ..document.OfficeDocument import OfficeDocument
from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO from com.sun.star.awt.VclWindowPeerAttribute import YES_NO, DEF_NO
from com.sun.star.uno import RuntimeException from com.sun.star.uno import RuntimeException

1
wizards/com/sun/star/wizards/ui/UnoDialog.py
View File

@@ -15,7 +15,6 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
import uno
import traceback import traceback
from .PeerConfig import PeerConfig from .PeerConfig import PeerConfig
from ..common.PropertyNames import PropertyNames from ..common.PropertyNames import PropertyNames

8
wizards/com/sun/star/wizards/ui/UnoDialog2.py
View File

@@ -15,10 +15,12 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
from .UIConsts import * from .UnoDialog import UnoDialog
from .UnoDialog import * from .UIConsts import UIConsts
from .event.CommonListener import *
from ..common.Desktop import Desktop from ..common.Desktop import Desktop
from ..common.PropertyNames import PropertyNames
from .event.CommonListener import ItemListenerProcAdapter, \
ActionListenerProcAdapter, TextListenerProcAdapter
''' '''
This class contains convenience methods for inserting components to a dialog. This class contains convenience methods for inserting components to a dialog.

9
wizards/com/sun/star/wizards/ui/WizardDialog.py
View File

@@ -15,11 +15,16 @@
# except in compliance with the License. You may obtain a copy of # except in compliance with the License. You may obtain a copy of
# the License at http://www.apache.org/licenses/LICENSE-2.0 . # the License at http://www.apache.org/licenses/LICENSE-2.0 .
# #
import uno
import traceback
from abc import ABCMeta, abstractmethod from abc import ABCMeta, abstractmethod
from .UnoDialog2 import * from .UnoDialog2 import UnoDialog2, Desktop, PropertyNames, UIConsts, \
ItemListenerProcAdapter
from .XPathSelectionListener import XPathSelectionListener from .XPathSelectionListener import XPathSelectionListener
from .event.CommonListener import TerminateListenerProcAdapter
from ..common.Helper import Helper
from ..common.Resource import Resource from ..common.Resource import Resource
from ..common.HelpIds import * from ..common.HelpIds import HelpIds
from ..document.OfficeDocument import OfficeDocument from ..document.OfficeDocument import OfficeDocument
from ..text.TextDocument import TextDocument from ..text.TextDocument import TextDocument