Merge branch 'common-diffpy-patches-py2'

Author: pavoljuhas

.gitattributes

@@ -5,3 +5,4 @@
 /devutils  export-ignore
 /doc  export-ignore
 .gitarchive.cfg  export-subst
+*.bat  text eol=crlf

README.rst

@@ -32,7 +32,7 @@ The diffpy.Structure requires Python 2.7 and the following software:
 * ``setuptools`` - software distribution tools for Python
 * ``NumPy`` - numerical mathematics and fast array operations for Python
 
-We recommend to use `Anaconda Python <https://www.continuum.io/downloads>`_
+We recommend to use `Anaconda Python <https://www.anaconda.com/download>`_
 as it allows to install all software dependencies together with
 diffpy.Structure.  For other Python distributions it is necessary to
 install the required software separately.  As an example on Ubuntu

src/diffpy/Structure/tests/__init__.py

@@ -54,8 +54,8 @@ def testsuite(pattern=''):
         return suite_all
     tcases = chain.from_iterable(tsuites)
     for tc in tcases:
-        tcwords = tc.id().rsplit('.', 2)
-        shortname = '.'.join(tcwords[-2:])
+        tcwords = tc.id().split('.')
+        shortname = '.'.join(tcwords[-3:])
         if rx.search(shortname):
             suite.addTest(tc)
     # verify all tests are found for an empty pattern.

src/diffpy/Structure/tests/run.py

@@ -21,6 +21,12 @@
 
 if __name__ == '__main__':
     import sys
+    # show warnings by default
+    if not sys.warnoptions:
+        import os, warnings
+        warnings.simplefilter("default")
+        # also affect subprocesses
+        os.environ["PYTHONWARNINGS"] = "default"
     from diffpy.Structure.tests import test
     # produce zero exit code for a successful test
     sys.exit(not test().wasSuccessful())