Commit df9937c4 authored by 's avatar

- removed unused Globals import

parent ca78f91a
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE # FOR A PARTICULAR PURPOSE.
# #
############################################################################## ##############################################################################
"""Product objects """Product objects
...@@ -204,8 +204,6 @@ InitializeClass(Product) ...@@ -204,8 +204,6 @@ InitializeClass(Product)
def initializeProduct(productp, name, home, app): def initializeProduct(productp, name, home, app):
# Initialize a persistent product # Initialize a persistent product
assert doInstall() assert doInstall()
import Globals # to set data
fver = '' fver = ''
if hasattr(productp, '__import_error__'): if hasattr(productp, '__import_error__'):
...@@ -289,4 +287,3 @@ def ihasattr(o, name): ...@@ -289,4 +287,3 @@ def ihasattr(o, name):
def doInstall(): def doInstall():
from App.config import getConfiguration from App.config import getConfiguration
return getConfiguration().enable_product_installation return getConfiguration().enable_product_installation
...@@ -85,8 +85,6 @@ def checkValidId(self, id, allow_dup=0): ...@@ -85,8 +85,6 @@ def checkValidId(self, id, allow_dup=0):
# only check that the id string contains no illegal chars; # only check that the id string contains no illegal chars;
# check_valid_id() will be called again later with allow_dup # check_valid_id() will be called again later with allow_dup
# set to false before the object is added. # set to false before the object is added.
import Globals # for data
if not id or not isinstance(id, str): if not id or not isinstance(id, str):
if isinstance(id, unicode): if isinstance(id, unicode):
id = escape(id) id = escape(id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment