diff --git a/product/ERP5/Document/BusinessTemplate.py b/product/ERP5/Document/BusinessTemplate.py
index 1825ec87f707a01a626894c78fab9fd8c8c16fc2..498b8a68beb8c786c0c37e329d3d8ee73dd47eb7 100644
--- a/product/ERP5/Document/BusinessTemplate.py
+++ b/product/ERP5/Document/BusinessTemplate.py
@@ -3780,7 +3780,7 @@ class DocumentTemplateItem(FilesystemToZodbTemplateItem):
                         "%s.py" % class_id)
 
   def _importFile(self, file_name, file_obj):
-    if (file_name.endswith('.py') and 
+    if (file_name.endswith('.py') and
         file_obj.name.rsplit(os.path.sep, 2)[-2] == 'portal_components'):
       return
 
diff --git a/product/ERP5Type/Core/Component.py b/product/ERP5Type/Core/Component.py
index 04c886109aef7d11bf08a398e04ee495f9f11e7a..ec8df89e7bce8d8a215408b37a3f811e893e3154 100644
--- a/product/ERP5Type/Core/Component.py
+++ b/product/ERP5Type/Core/Component.py
@@ -34,7 +34,7 @@ from Products.ERP5Type.Base import Base
 from Products.ERP5Type.Accessor.Constant import PropertyGetter as ConstantGetter
 from Products.ERP5Type.ConsistencyMessage import ConsistencyMessage
 
-from zLOG import LOG, INFO                           
+from zLOG import LOG, INFO
 
 class Component(Base):
   # CMF Type Definition
@@ -93,7 +93,7 @@ class Component(Base):
     """
     Add the Component to its appropriate module registry
     """
-    namespace_fullname = self._getDynamicModuleNamespace() 
+    namespace_fullname = self._getDynamicModuleNamespace()
     namespace_module = __import__(namespace_fullname, {}, {},
                                   fromlist=[namespace_fullname])
 
@@ -108,7 +108,7 @@ class Component(Base):
     """
     Delete the Component from its appropriate module registry
     """
-    namespace_fullname = self._getDynamicModuleNamespace() 
+    namespace_fullname = self._getDynamicModuleNamespace()
     namespace_module = __import__(namespace_fullname, {}, {},
                                   fromlist=[namespace_fullname])
 
@@ -221,7 +221,7 @@ class Component(Base):
     Try to import all Components and returns error as a dict if any
     """
     import os.path
-    path_pattern = "%s%s*.py" % (cls._getFilesystemPath(), os.path.sep)    
+    path_pattern = "%s%s*.py" % (cls._getFilesystemPath(), os.path.sep)
 
     LOG("ERP5Type.Core.Component", INFO, "Importing from %s" % path_pattern)
 
diff --git a/product/ERP5Type/Core/TestDocument.py b/product/ERP5Type/Core/TestDocument.py
index fb02dd6f58dbaf379ea00caf999c6f60143cb65d..f4f5e457fcd978adc478da3ae3bac64295f337b2 100644
--- a/product/ERP5Type/Core/TestDocument.py
+++ b/product/ERP5Type/Core/TestDocument.py
@@ -12,4 +12,3 @@ class TestDocument(Base):
     """
     """
     return "zozo"
-
diff --git a/product/ERP5Type/Tool/ComponentTool.py b/product/ERP5Type/Tool/ComponentTool.py
index 6b0fafcee18dbab5f67e5d02f182ba48f059116d..bbf93718e76661183baccf388c7c9fce2b53e3c6 100644
--- a/product/ERP5Type/Tool/ComponentTool.py
+++ b/product/ERP5Type/Tool/ComponentTool.py
@@ -43,7 +43,7 @@ from zLOG import LOG, INFO, WARNING
 _last_sync = -1
 class ComponentTool(BaseTool):
   """
-    This tool provides methods to load the the different types 
+    This tool provides methods to load the the different types
     of components of the ERP5 framework: Document classes, interfaces,
     mixin classes, fields, accessors, etc.
   """
diff --git a/product/ERP5Type/tests/testDynamicClassGeneration.py b/product/ERP5Type/tests/testDynamicClassGeneration.py
index ab4ac77cf2eb064ba56485413407259f447f7aa0..b1204627d22975ca561b0833b7978e8207a65eb7 100644
--- a/product/ERP5Type/tests/testDynamicClassGeneration.py
+++ b/product/ERP5Type/tests/testDynamicClassGeneration.py
@@ -1241,7 +1241,7 @@ class _TestZodbComponent(ERP5TypeTestCase):
     pass
 
   def _getComponentFullModuleName(self, module_name):
-    return "%s.%s" % (self._getComponentModuleName(), module_name)    
+    return "%s.%s" % (self._getComponentModuleName(), module_name)
 
   def failIfModuleImportable(self, module_name):
     full_module_name = self._getComponentFullModuleName(module_name)
@@ -1256,7 +1256,7 @@ class _TestZodbComponent(ERP5TypeTestCase):
                              full_module_name)
 
   def assertModuleImportable(self, module_name):
-    full_module_name = self._getComponentFullModuleName(module_name)    
+    full_module_name = self._getComponentFullModuleName(module_name)
 
     try:
       __import__(full_module_name, fromlist=[self._getComponentModuleName()],
@@ -1335,7 +1335,7 @@ class _TestZodbComponent(ERP5TypeTestCase):
     self.assertEquals(component.getValidationState(), 'validated')
     self.assertEquals(component._getErrorMessage(), '')
     self.assertEquals(component.getTextContent(), valid_code)
-    self.assertEquals(component.getTextContent(validated_only=True), valid_code)    
+    self.assertEquals(component.getTextContent(validated_only=True), valid_code)
     self.assertModuleImportable('TestComponentWithSyntaxError')
 
 from Products.ERP5Type.Core.ExtensionComponent import ExtensionComponent
@@ -1466,7 +1466,7 @@ class TestPortalType(Person):
 
       self.assertHasAttribute(person, 'test42')
       self.assertEquals(person.test42(), 42)
-      
+
       # The Portal Type class should not be in ghost state by now as we tried
       # to access test42() defined in TestPortalType Document Component
       self.assertModuleImportable('TestPortalType')