Merge branch 'fast-import' of github.com:blink1073/scikits-image into fast-import

* 'fast-import' of github.com:blink1073/scikits-image:
  STY: Added newline at the end of file
  STY: Fixed indent on docstring.
  Lazily import nose for testing, makes skimge load in 1/3 time.
This commit is contained in:
Steven Silvester
2012-12-15 07:52:51 -06:00
+1 -1
View File
@@ -122,7 +122,7 @@ def _setup_log():
formatter = logging.Formatter(
'%(name)s: %(levelname)s: %(message)s'
)
)
try:
handler = logging.StreamHandler(stream=sys.stdout)