[Checkins] SVN: transaction/branches/sphinx/ Don't work too hard to cover _compat.

Tres Seaver cvs-admin at zope.org
Mon Dec 17 22:09:01 UTC 2012


Log message for revision 128711:
  Don't work too hard to cover _compat.

Changed:
  _U  transaction/branches/sphinx/
  U   transaction/branches/sphinx/transaction/_compat.py

-=-
Modified: transaction/branches/sphinx/transaction/_compat.py
===================================================================
--- transaction/branches/sphinx/transaction/_compat.py	2012-12-17 20:33:57 UTC (rev 128710)
+++ transaction/branches/sphinx/transaction/_compat.py	2012-12-17 22:09:01 UTC (rev 128711)
@@ -18,33 +18,28 @@
     binary_type = str
     long = long
 
-def text_(s, encoding='latin-1', errors='strict'):
-    if isinstance(s, binary_type):
-        return s.decode(encoding, errors)
-    return s # pragma: no cover
-
-def bytes_(s, encoding='latin-1', errors='strict'):
+def bytes_(s, encoding='latin-1', errors='strict'): #pragma NO COVER
     if isinstance(s, text_type):
         return s.encode(encoding, errors)
     return s
 
 if PY3: # pragma: no cover
-    def native_(s, encoding='latin-1', errors='strict'):
+    def native_(s, encoding='latin-1', errors='strict'): #pragma NO COVER
         if isinstance(s, text_type):
             return s
         return str(s, encoding, errors)
 else:
-    def native_(s, encoding='latin-1', errors='strict'):
+    def native_(s, encoding='latin-1', errors='strict'): #pragma NO COVER
         if isinstance(s, text_type):
             return s.encode(encoding, errors)
         return str(s)
 
-if PY3:
+if PY3: #pragma NO COVER
     from io import StringIO
 else:
     from io import BytesIO as StringIO
 
-if PY3:
+if PY3: #pragma NO COVER
     from collections import MutableMapping
 else:
     from UserDict import UserDict as MutableMapping
@@ -54,13 +49,13 @@
     exec_ = getattr(builtins, "exec")
 
 
-    def reraise(tp, value, tb=None):
+    def reraise(tp, value, tb=None): #pragma NO COVER
         if value.__traceback__ is not tb:
             raise value.with_traceback(tb)
         raise value
 
 else: # pragma: no cover
-    def exec_(code, globs=None, locs=None):
+    def exec_(code, globs=None, locs=None): #pragma NO COVER
         """Execute code in a namespace."""
         if globs is None:
             frame = sys._getframe(1)
@@ -77,7 +72,7 @@
 """)
 
 
-if PY3:
+if PY3: #pragma NO COVER
     try:
         from threading import get_ident as get_thread_ident
     except ImportError:
@@ -87,9 +82,9 @@
     
     
 if PY3:
-    def func_name(func):
+    def func_name(func): #pragma NO COVER
         return func.__name__
 else:
-    def func_name(func):
+    def func_name(func): #pragma NO COVER
         return func.func_name
-    
+ 



More information about the checkins mailing list