Merge pull request #64 from zodb/rst-files

Rename main .txt files to .rst for better rendering on github.
zodb · Jun 21, 2016 · c0dbc38 · c0dbc38
2 parents 05acab2 + 0118517
commit c0dbc38
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/CHANGES.txt → CHANGES.rst b/CHANGES.txt → CHANGES.rst
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,2 +1,2 @@
-include MANIFEST.in *.txt *.py *.patch
+include MANIFEST.in *.txt *.rst *.py *.patch
 recursive-include relstorage *.py *.xml *.txt
diff --git a/README.txt → README.rst b/README.txt → README.rst
diff --git a/relstorage/options.py b/relstorage/options.py
@@ -21,10 +21,13 @@
 from relstorage._compat import iteritems
 default_strict_tpc = False
 
-from ZEO.zrpc.connection import Connection as __Connection
-if __Connection.current_protocol >= b'Z310':
+try:
+    from ZEO.zrpc.connection import Connection as __Connection # XXX Goes away in ZEO5
+    if __Connection.current_protocol >= b'Z310':
+        default_strict_tpc = True
+    del __Connection
+except ImportError:
     default_strict_tpc = True
-del __Connection
 
 class Options(object):
     """Options for configuring and tuning RelStorage.

diff --git a/setup.py b/setup.py
@@ -70,10 +70,10 @@ def read_file(*path):
     description=doclines[0],
     classifiers=filter(None, classifiers.split("\n")),
     long_description=(
-        read_file("README.txt") + "\n\n" +
+        read_file("README.rst") + "\n\n" +
         "Change History\n" +
         "==============\n\n" +
-        read_file("CHANGES.txt")),
+        read_file("CHANGES.rst")),
     zip_safe=False,  # otherwise ZConfig can't see component.xml
     install_requires=[
         'perfmetrics',