[SQL-CVS] r4640 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: Wed Aug 14 11:16:03 2013
New Revision: 4640

Log:
Merged revisions 4637-4639 from branch 1.5: logging is always available;

on w32 there is no need to replace semicolon but it's recommended
to straighten backslashes; removed unused workaround for old Python.

Modified:
   SQLObject/trunk/sqlobject/tests/dbtest.py

Modified: SQLObject/trunk/sqlobject/tests/dbtest.py
==============================================================================
--- SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 11:14:24 2013	(r4639)
+++ SQLObject/trunk/sqlobject/tests/dbtest.py	Wed Aug 14 11:16:03 2013	(r4640)
@@ -2,23 +2,17 @@
 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(':', '|')
+        return os.getcwd().replace('\\', '/')
 else:
     getcwd = os.getcwd
 
@@ -222,13 +216,6 @@
         for name, value in kw.items():
             setattr(self, name, value)
 
-def d(**kw):
-    """
-    Because ``dict(**kw)`` doesn't work in Python 2.2, this is a
-    replacement.
-    """
-    return kw
-
 def inserts(cls, data, schema=None):
     """
     Creates a bunch of rows.
@@ -314,8 +301,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)
@@ -325,5 +310,5 @@
     logger.addHandler(hdlr)
 
 __all__ = ['getConnection', 'getConnectionURI', 'setupClass', 'Dummy', 'raises',
-           'd', 'inserts', 'supports', 'deprecated_module',
+           'inserts', 'supports', 'deprecated_module',
            'setup_module', 'teardown_module', 'setupLogging']