Thread: [SQL-CVS] r4637 - SQLObject/branches/1.5/sqlobject/tests
SQLObject is a Python ORM.
Brought to you by:
ianbicking,
phd
From: <sub...@co...> - 2013-08-14 17:08:52
|
Author: phd Date: Wed Aug 14 11:08:42 2013 New Revision: 4637 Log: logging is always available -- SQLObject requires at least Python 2.4 Modified: SQLObject/branches/1.5/sqlobject/tests/dbtest.py Modified: SQLObject/branches/1.5/sqlobject/tests/dbtest.py ============================================================================== --- SQLObject/branches/1.5/sqlobject/tests/dbtest.py Wed Aug 14 09:19:06 2013 (r4636) +++ SQLObject/branches/1.5/sqlobject/tests/dbtest.py Wed Aug 14 11:08:42 2013 (r4637) @@ -2,20 +2,14 @@ The framework for making database tests. """ -import sys +import logging import os import re +import sys from py.test import raises -import py import sqlobject import sqlobject.conftest as conftest -try: - import logging - loggingModuleAvailable = True -except ImportError: - loggingModuleAvailable = False - if sys.platform[:3] == "win": def getcwd(): return os.getcwd().replace(':', '|') @@ -314,8 +308,6 @@ sqlobject.main.exception_level = 0 def setupLogging(): - if not loggingModuleAvailable: - return fmt = '[%(asctime)s] %(name)s %(levelname)s: %(message)s' formatter = logging.Formatter(fmt) hdlr = logging.StreamHandler(sys.stderr) |