[Checkins] SVN: transaction/branches/sphinx/ The compatibility module is private.

Tres Seaver cvs-admin at zope.org
Mon Dec 17 20:33:57 UTC 2012


Log message for revision 128710:
  The compatibility module is private.

Changed:
  _U  transaction/branches/sphinx/
  U   transaction/branches/sphinx/docs/hooks.rst
  A   transaction/branches/sphinx/transaction/_compat.py
  U   transaction/branches/sphinx/transaction/_manager.py
  U   transaction/branches/sphinx/transaction/_transaction.py
  D   transaction/branches/sphinx/transaction/compat.py

-=-
Modified: transaction/branches/sphinx/docs/hooks.rst
===================================================================
--- transaction/branches/sphinx/docs/hooks.rst	2012-12-17 20:28:56 UTC (rev 128709)
+++ transaction/branches/sphinx/docs/hooks.rst	2012-12-17 20:33:57 UTC (rev 128710)
@@ -20,7 +20,7 @@
 .. doctest::
 
     >>> from transaction import begin
-    >>> from transaction.compat import func_name
+    >>> from transaction._compat import func_name
     >>> import transaction
     >>> t = begin()
     >>> t.addBeforeCommitHook(hook, '1')
@@ -187,7 +187,7 @@
 .. doctest::
 
     >>> from transaction import begin
-    >>> from transaction.compat import func_name
+    >>> from transaction._compat import func_name
     >>> t = begin()
     >>> t.addAfterCommitHook(hook, '1')
 

Copied: transaction/branches/sphinx/transaction/_compat.py (from rev 128709, transaction/branches/sphinx/transaction/compat.py)
===================================================================
--- transaction/branches/sphinx/transaction/_compat.py	                        (rev 0)
+++ transaction/branches/sphinx/transaction/_compat.py	2012-12-17 20:33:57 UTC (rev 128710)
@@ -0,0 +1,95 @@
+import sys
+import types
+
+PY3 = sys.version_info[0] == 3
+
+if PY3: # pragma: no cover
+    string_types = str,
+    integer_types = int,
+    class_types = type,
+    text_type = str
+    binary_type = bytes
+    long = int
+else:
+    string_types = basestring,
+    integer_types = (int, long)
+    class_types = (type, types.ClassType)
+    text_type = unicode
+    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'):
+    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'):
+        if isinstance(s, text_type):
+            return s
+        return str(s, encoding, errors)
+else:
+    def native_(s, encoding='latin-1', errors='strict'):
+        if isinstance(s, text_type):
+            return s.encode(encoding, errors)
+        return str(s)
+
+if PY3:
+    from io import StringIO
+else:
+    from io import BytesIO as StringIO
+
+if PY3:
+    from collections import MutableMapping
+else:
+    from UserDict import UserDict as MutableMapping
+
+if PY3: # pragma: no cover
+    import builtins
+    exec_ = getattr(builtins, "exec")
+
+
+    def reraise(tp, value, tb=None):
+        if value.__traceback__ is not tb:
+            raise value.with_traceback(tb)
+        raise value
+
+else: # pragma: no cover
+    def exec_(code, globs=None, locs=None):
+        """Execute code in a namespace."""
+        if globs is None:
+            frame = sys._getframe(1)
+            globs = frame.f_globals
+            if locs is None:
+                locs = frame.f_locals
+            del frame
+        elif locs is None:
+            locs = globs
+        exec("""exec code in globs, locs""")
+
+    exec_("""def reraise(tp, value, tb=None):
+    raise tp, value, tb
+""")
+
+
+if PY3:
+    try:
+        from threading import get_ident as get_thread_ident
+    except ImportError:
+        from threading import _get_ident as get_thread_ident
+else:
+    from thread import get_ident as get_thread_ident
+    
+    
+if PY3:
+    def func_name(func):
+        return func.__name__
+else:
+    def func_name(func):
+        return func.func_name
+    

Modified: transaction/branches/sphinx/transaction/_manager.py
===================================================================
--- transaction/branches/sphinx/transaction/_manager.py	2012-12-17 20:28:56 UTC (rev 128709)
+++ transaction/branches/sphinx/transaction/_manager.py	2012-12-17 20:33:57 UTC (rev 128710)
@@ -22,10 +22,10 @@
 from zope.interface import implementer
 
 from transaction.weakset import WeakSet
-from transaction._transaction import Transaction
 from transaction.interfaces import ITransactionManager
 from transaction.interfaces import TransientError
-from transaction.compat import reraise
+from transaction._compat import reraise
+from transaction._transaction import Transaction
 
 
 # We have to remember sets of synch objects, especially Connections.

Modified: transaction/branches/sphinx/transaction/_transaction.py
===================================================================
--- transaction/branches/sphinx/transaction/_transaction.py	2012-12-17 20:28:56 UTC (rev 128709)
+++ transaction/branches/sphinx/transaction/_transaction.py	2012-12-17 20:33:57 UTC (rev 128710)
@@ -105,14 +105,14 @@
 
 from zope.interface import implementer
 
-from transaction.compat import reraise
-from transaction.compat import get_thread_ident
-from transaction.compat import native_
-from transaction.compat import bytes_
-from transaction.compat import StringIO
 from transaction.weakset import WeakSet
 from transaction.interfaces import TransactionFailedError
 from transaction import interfaces
+from transaction._compat import reraise
+from transaction._compat import get_thread_ident
+from transaction._compat import native_
+from transaction._compat import bytes_
+from transaction._compat import StringIO
 
 _marker = object()
 

Deleted: transaction/branches/sphinx/transaction/compat.py
===================================================================
--- transaction/branches/sphinx/transaction/compat.py	2012-12-17 20:28:56 UTC (rev 128709)
+++ transaction/branches/sphinx/transaction/compat.py	2012-12-17 20:33:57 UTC (rev 128710)
@@ -1,95 +0,0 @@
-import sys
-import types
-
-PY3 = sys.version_info[0] == 3
-
-if PY3: # pragma: no cover
-    string_types = str,
-    integer_types = int,
-    class_types = type,
-    text_type = str
-    binary_type = bytes
-    long = int
-else:
-    string_types = basestring,
-    integer_types = (int, long)
-    class_types = (type, types.ClassType)
-    text_type = unicode
-    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'):
-    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'):
-        if isinstance(s, text_type):
-            return s
-        return str(s, encoding, errors)
-else:
-    def native_(s, encoding='latin-1', errors='strict'):
-        if isinstance(s, text_type):
-            return s.encode(encoding, errors)
-        return str(s)
-
-if PY3:
-    from io import StringIO
-else:
-    from io import BytesIO as StringIO
-
-if PY3:
-    from collections import MutableMapping
-else:
-    from UserDict import UserDict as MutableMapping
-
-if PY3: # pragma: no cover
-    import builtins
-    exec_ = getattr(builtins, "exec")
-
-
-    def reraise(tp, value, tb=None):
-        if value.__traceback__ is not tb:
-            raise value.with_traceback(tb)
-        raise value
-
-else: # pragma: no cover
-    def exec_(code, globs=None, locs=None):
-        """Execute code in a namespace."""
-        if globs is None:
-            frame = sys._getframe(1)
-            globs = frame.f_globals
-            if locs is None:
-                locs = frame.f_locals
-            del frame
-        elif locs is None:
-            locs = globs
-        exec("""exec code in globs, locs""")
-
-    exec_("""def reraise(tp, value, tb=None):
-    raise tp, value, tb
-""")
-
-
-if PY3:
-    try:
-        from threading import get_ident as get_thread_ident
-    except ImportError:
-        from threading import _get_ident as get_thread_ident
-else:
-    from thread import get_ident as get_thread_ident
-    
-    
-if PY3:
-    def func_name(func):
-        return func.__name__
-else:
-    def func_name(func):
-        return func.func_name
-    



More information about the checkins mailing list