From 3510bda1e6fd7cb66fd6bb82f6c560991503fdee Mon Sep 17 00:00:00 2001
From: John Szakmeister <john@szakmeister.net>
Date: Sun, 25 Jan 2015 06:10:59 -0500
Subject: Strip trailing whitespace from loader.py.

---
 nose/loader.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'nose')

diff --git a/nose/loader.py b/nose/loader.py
index 2e6b919..efe1b10 100644
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -55,7 +55,7 @@ class TestLoader(unittest.TestLoader):
     workingDir = None
     selector = None
     suiteClass = None
-    
+
     def __init__(self, config=None, importer=None, workingDir=None,
                  selector=None):
         """Initialize a test loader.
@@ -64,7 +64,7 @@ class TestLoader(unittest.TestLoader):
 
         * config: provide a `nose.config.Config`_ or other config class
           instance; if not provided a `nose.config.Config`_ with
-          default values is used.          
+          default values is used.
         * importer: provide an importer instance that implements
           `importFromPath`. If not provided, a
           `nose.importer.Importer`_ is used.
@@ -91,7 +91,7 @@ class TestLoader(unittest.TestLoader):
         self.workingDir = op_normpath(op_abspath(workingDir))
         self.selector = selector
         if config.addPaths:
-            add_path(workingDir, config)        
+            add_path(workingDir, config)
         self.suiteClass = ContextSuiteFactory(config=config)
 
         self._visitedPaths = set([])
@@ -139,7 +139,7 @@ class TestLoader(unittest.TestLoader):
         -- each suite of tests from a module or other file is yielded
         and is expected to be executed before the next file is
         examined.
-        """        
+        """
         log.debug("load from dir %s", path)
         plugins = self.config.plugins
         plugins.beforeDirectory(path)
@@ -204,7 +204,7 @@ class TestLoader(unittest.TestLoader):
             raise
         except:
             yield self.suiteClass([Failure(*sys.exc_info())])
-        
+
         # pop paths
         if self.config.addPaths:
             for p in paths_added:
@@ -354,12 +354,12 @@ class TestLoader(unittest.TestLoader):
                 # directory before trying to load from it.
                 if os.path.isdir(module_path):
                     tests.extend(self.loadTestsFromDir(module_path))
-            
+
         for test in self.config.plugins.loadTestsFromModule(module, path):
             tests.append(test)
 
         return self.suiteClass(ContextList(tests, context=module))
-    
+
     def loadTestsFromName(self, name, module=None, discovered=False):
         """Load tests from the entity with the given name.
 
@@ -369,14 +369,14 @@ class TestLoader(unittest.TestLoader):
         """
         # FIXME refactor this method into little bites?
         log.debug("load from %s (%s)", name, module)
-        
+
         suite = self.suiteClass
 
         # give plugins first crack
         plug_tests = self.config.plugins.loadTestsFromName(name, module)
         if plug_tests:
             return suite(plug_tests)
-        
+
         addr = TestAddress(name, workingDir=self.workingDir)
         if module:
             # Two cases:
@@ -498,7 +498,7 @@ class TestLoader(unittest.TestLoader):
             [case for case in
              super(TestLoader, self).loadTestsFromTestCase(testCaseClass)])
         return self.suiteClass(cases)
-    
+
     def loadTestsFromTestClass(self, cls):
         """Load tests from a test class that is *not* a unittest.TestCase
         subclass.
@@ -534,7 +534,7 @@ class TestLoader(unittest.TestLoader):
             except:
                 addr = None
             return Failure(exc[0], exc[1], exc[2], address=addr)
-    
+
     def _makeTest(self, obj, parent=None):
         """Given a test object and its parent, return a test case
         or test suite.
@@ -557,7 +557,7 @@ class TestLoader(unittest.TestLoader):
         except:
             exc = sys.exc_info()
             return Failure(exc[0], exc[1], exc[2], address=addr)
-        
+
         if isfunction(obj) and parent and not isinstance(parent, types.ModuleType):
 	    # This is a Python 3.x 'unbound method'.  Wrap it with its
 	    # associated class..
-- 
cgit v1.2.1