Merge remote-tracking branch 'upstream/master'

* upstream/master: (22 commits) Index: mark various C++11 features as such Index: add some protected members Index: add literal operators Index: add floating-point comparison functions Index: update experimental libraries Index: add chrono literals Index: delete removed names Index: update filesystem library Index: add calendar and time zone library Bump lxml from 4.5.2 to 4.6.2 Index: remove extra whitespace and remove SCNX* Index: add std::ranges algorithms Index: update sections for the atomic library Index: change "special_math" to "special_functions" Index: update thread support library Index: add legacy function objects and valarray members Index: add interpolations & bit operations travis: Update ubuntu distribution to bionic travis: Update python version for tests Sort python imports ...
PeterFeicht · Nov 27, 2021 · 97bb76b · 97bb76b
2 parents 899f614 + 08c5921
commit 97bb76b
Show file tree

Hide file tree

Showing 35 changed files with 1,902 additions and 678 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,14 @@
 # Travis CI configuration file
 # http://about.travis-ci.org/docs/
-dist: trusty
+dist: bionic
 
 language: python
 
 # Available Python versions:
 # http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images
 python:
-  - "3.5"
   - "3.6"
+  - "3.7"
 
 # Dependencies installation commands
 install:

diff --git a/build_link_map.py b/build_link_map.py
@@ -21,8 +21,9 @@
 # filename -> title mapping to a xml file.
 
 import fnmatch
-import re
 import os
+import re
+
 from link_map import LinkMap
 
 

diff --git a/commands/preprocess.py b/commands/preprocess.py
@@ -20,10 +20,11 @@
 from datetime import datetime
 import fnmatch
 import io
-import re
 import os
+import re
 import shutil
 import urllib.parse
+
 from lxml import etree
 
 

diff --git a/commands/preprocess_cssless.py b/commands/preprocess_cssless.py
@@ -21,10 +21,11 @@
 import logging
 import os
 import warnings
-from premailer import Premailer
+
 import cssutils
 from lxml import etree
 from lxml.etree import strip_elements
+from premailer import Premailer
 
 
 def preprocess_html_merge_cssless(src_path, dst_path):

diff --git a/ddg_parse_html.py b/ddg_parse_html.py
@@ -20,6 +20,7 @@
 
 import re
 from copy import deepcopy
+
 import lxml.etree as e
 
 
@@ -34,8 +35,8 @@ def get_content_el(root_el):
                             /div[@id="content"]
                             /div[@id="bodyContent"]
                             /div[@class="mw-content-ltr"]''')[0]
-    except Exception:
-        raise DdgException("Could not find content element")
+    except Exception as e:
+        raise DdgException("Could not find content element") from e
 
 
 VERSION_C89 = 0

diff --git a/devhelp2qch.py b/devhelp2qch.py
@@ -19,7 +19,9 @@
 
 
 import argparse
+
 from lxml import etree
+
 from index_transform.devhelp_qch import convert_devhelp_to_qch
 
 

diff --git a/export.py b/export.py
@@ -19,9 +19,9 @@
 '''
 
 import argparse
+import json
 import urllib.parse
 import urllib.request
-import json
 
 
 def retrieve_page_names(root, ns_index):

diff --git a/fix_devhelp-links.py b/fix_devhelp-links.py
@@ -19,9 +19,10 @@
 '''
 
 import sys
+
 import lxml.etree as e
-from link_map import LinkMap
 
+from link_map import LinkMap
 
 if len(sys.argv) != 3:
     print('''Please provide the following 2 argument:

diff --git a/gadgets/replace_tests_base.py b/gadgets/replace_tests_base.py
@@ -24,6 +24,7 @@
 import re
 import sys
 
+
 def get_html_files(root):
     files = []
     for dir, dirnames, filenames in os.walk(root):

diff --git a/gadgets/standard_revisions_tests/base.py b/gadgets/standard_revisions_tests/base.py
@@ -18,6 +18,7 @@
 '''
 
 import unittest
+
 from selenium import webdriver
 from selenium.webdriver.support.ui import Select
 

diff --git a/gadgets/sync_tests_mwiki.py b/gadgets/sync_tests_mwiki.py
@@ -29,17 +29,17 @@
 # command line.
 os.environ['PYWIKIBOT2_NO_USER_CONFIG']='1'
 
-import pywikibot
-import pywikibot.config2
-import pywikibot.pagegenerators
-import pywikibot.data.api
-
 import argparse
 import itertools
 import shutil
 import sys
 import urllib
 
+import pywikibot
+import pywikibot.config2
+import pywikibot.data.api
+import pywikibot.pagegenerators
+
 SYNC_DIRECTION_UPLOAD = 1
 SYNC_DIRECTION_DOWNLOAD = 2
 

diff --git a/images/math-atan2.py b/images/math-atan2.py
@@ -17,14 +17,14 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
+import math
+import os
+import pprint
+
 import matplotlib.cm as cm
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
-
-import os
 import numpy as np
-import math
-import pprint
 
 font = {'family' : 'DejaVu Sans',
         'weight' : 'normal',

diff --git a/images/math.py b/images/math.py
@@ -16,11 +16,12 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-import matplotlib.pyplot as plt
 import os
-from numpy import *
 from bisect import *
 
+import matplotlib.pyplot as plt
+from numpy import *
+
 #
 # DATA - array of items describing data to plot
 # Each item consists of the following parts

diff --git a/index-functions-c.xml b/index-functions-c.xml
@@ -125,7 +125,7 @@
     <const name="PRIdFAST32" link="c/types/integer"/>
     <const name="PRIdFAST64" link="c/types/integer"/>
     <const name="PRIdMAX" link="c/types/integer"/>
-    <const name="PRIdPTR " link="c/types/integer"/>
+    <const name="PRIdPTR" link="c/types/integer"/>
 
     <const name="PRIi8" link="c/types/integer"/>
     <const name="PRIi16" link="c/types/integer"/>
@@ -140,7 +140,7 @@
     <const name="PRIiFAST32" link="c/types/integer"/>
     <const name="PRIiFAST64" link="c/types/integer"/>
     <const name="PRIiMAX" link="c/types/integer"/>
-    <const name="PRIiPTR " link="c/types/integer"/>
+    <const name="PRIiPTR" link="c/types/integer"/>
 
     <const name="PRIu8" link="c/types/integer"/>
     <const name="PRIu16" link="c/types/integer"/>
@@ -155,7 +155,7 @@
     <const name="PRIuFAST32" link="c/types/integer"/>
     <const name="PRIuFAST64" link="c/types/integer"/>
     <const name="PRIuMAX" link="c/types/integer"/>
-    <const name="PRIuPTR " link="c/types/integer"/>
+    <const name="PRIuPTR" link="c/types/integer"/>
 
     <const name="PRIo8" link="c/types/integer"/>
     <const name="PRIo16" link="c/types/integer"/>
@@ -170,7 +170,7 @@
     <const name="PRIoFAST32" link="c/types/integer"/>
     <const name="PRIoFAST64" link="c/types/integer"/>
     <const name="PRIoMAX" link="c/types/integer"/>
-    <const name="PRIoPTR " link="c/types/integer"/>
+    <const name="PRIoPTR" link="c/types/integer"/>
 
     <const name="PRIx8" link="c/types/integer"/>
     <const name="PRIx16" link="c/types/integer"/>
@@ -185,7 +185,7 @@
     <const name="PRIxFAST32" link="c/types/integer"/>
     <const name="PRIxFAST64" link="c/types/integer"/>
     <const name="PRIxMAX" link="c/types/integer"/>
-    <const name="PRIxPTR " link="c/types/integer"/>
+    <const name="PRIxPTR" link="c/types/integer"/>
 
     <const name="PRIX8" link="c/types/integer"/>
     <const name="PRIX16" link="c/types/integer"/>
@@ -200,7 +200,7 @@
     <const name="PRIXFAST32" link="c/types/integer"/>
     <const name="PRIXFAST64" link="c/types/integer"/>
     <const name="PRIXMAX" link="c/types/integer"/>
-    <const name="PRIXPTR " link="c/types/integer"/>
+    <const name="PRIXPTR" link="c/types/integer"/>
 
     <const name="SCNd8" link="c/types/integer"/>
     <const name="SCNd16" link="c/types/integer"/>
@@ -215,7 +215,7 @@
     <const name="SCNdFAST32" link="c/types/integer"/>
     <const name="SCNdFAST64" link="c/types/integer"/>
     <const name="SCNdMAX" link="c/types/integer"/>
-    <const name="SCNdPTR " link="c/types/integer"/>
+    <const name="SCNdPTR" link="c/types/integer"/>
 
     <const name="SCNi8" link="c/types/integer"/>
     <const name="SCNi16" link="c/types/integer"/>
@@ -230,7 +230,7 @@
     <const name="SCNiFAST32" link="c/types/integer"/>
     <const name="SCNiFAST64" link="c/types/integer"/>
     <const name="SCNiMAX" link="c/types/integer"/>
-    <const name="SCNiPTR " link="c/types/integer"/>
+    <const name="SCNiPTR" link="c/types/integer"/>
 
     <const name="SCNu8" link="c/types/integer"/>
     <const name="SCNu16" link="c/types/integer"/>
@@ -245,7 +245,7 @@
     <const name="SCNuFAST32" link="c/types/integer"/>
     <const name="SCNuFAST64" link="c/types/integer"/>
     <const name="SCNuMAX" link="c/types/integer"/>
-    <const name="SCNuPTR " link="c/types/integer"/>
+    <const name="SCNuPTR" link="c/types/integer"/>
 
     <const name="SCNo8" link="c/types/integer"/>
     <const name="SCNo16" link="c/types/integer"/>
@@ -260,7 +260,7 @@
     <const name="SCNoFAST32" link="c/types/integer"/>
     <const name="SCNoFAST64" link="c/types/integer"/>
     <const name="SCNoMAX" link="c/types/integer"/>
-    <const name="SCNoPTR " link="c/types/integer"/>
+    <const name="SCNoPTR" link="c/types/integer"/>
 
     <const name="SCNx8" link="c/types/integer"/>
     <const name="SCNx16" link="c/types/integer"/>
@@ -275,22 +275,7 @@
     <const name="SCNxFAST32" link="c/types/integer"/>
     <const name="SCNxFAST64" link="c/types/integer"/>
     <const name="SCNxMAX" link="c/types/integer"/>
-    <const name="SCNxPTR " link="c/types/integer"/>
-
-    <const name="SCNX8" link="c/types/integer"/>
-    <const name="SCNX16" link="c/types/integer"/>
-    <const name="SCNX32" link="c/types/integer"/>
-    <const name="SCNX64" link="c/types/integer"/>
-    <const name="SCNXLEAST8" link="c/types/integer"/>
-    <const name="SCNXLEAST16" link="c/types/integer"/>
-    <const name="SCNXLEAST32" link="c/types/integer"/>
-    <const name="SCNXLEAST64" link="c/types/integer"/>
-    <const name="SCNXFAST8" link="c/types/integer"/>
-    <const name="SCNXFAST16" link="c/types/integer"/>
-    <const name="SCNXFAST32" link="c/types/integer"/>
-    <const name="SCNXFAST64" link="c/types/integer"/>
-    <const name="SCNXMAX" link="c/types/integer"/>
-    <const name="SCNXPTR" link="c/types/integer"/>
+    <const name="SCNxPTR" link="c/types/integer"/>
 
         <!-- c/types/limits -->
     <const name="PTRDIFF_MIN" link="c/types/limits"/>