Skip to content

Commit 97bb76b

Browse files
committed
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 ...
2 parents 899f614 + 08c5921 commit 97bb76b

35 files changed

+1902
-678
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Travis CI configuration file
22
# http://about.travis-ci.org/docs/
3-
dist: trusty
3+
dist: bionic
44

55
language: python
66

77
# Available Python versions:
88
# http://about.travis-ci.org/docs/user/ci-environment/#Python-VM-images
99
python:
10-
- "3.5"
1110
- "3.6"
11+
- "3.7"
1212

1313
# Dependencies installation commands
1414
install:

build_link_map.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
# filename -> title mapping to a xml file.
2222

2323
import fnmatch
24-
import re
2524
import os
25+
import re
26+
2627
from link_map import LinkMap
2728

2829

commands/preprocess.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
from datetime import datetime
2121
import fnmatch
2222
import io
23-
import re
2423
import os
24+
import re
2525
import shutil
2626
import urllib.parse
27+
2728
from lxml import etree
2829

2930

commands/preprocess_cssless.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@
2121
import logging
2222
import os
2323
import warnings
24-
from premailer import Premailer
24+
2525
import cssutils
2626
from lxml import etree
2727
from lxml.etree import strip_elements
28+
from premailer import Premailer
2829

2930

3031
def preprocess_html_merge_cssless(src_path, dst_path):

ddg_parse_html.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import re
2222
from copy import deepcopy
23+
2324
import lxml.etree as e
2425

2526

@@ -34,8 +35,8 @@ def get_content_el(root_el):
3435
/div[@id="content"]
3536
/div[@id="bodyContent"]
3637
/div[@class="mw-content-ltr"]''')[0]
37-
except Exception:
38-
raise DdgException("Could not find content element")
38+
except Exception as e:
39+
raise DdgException("Could not find content element") from e
3940

4041

4142
VERSION_C89 = 0

devhelp2qch.py

+2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919

2020

2121
import argparse
22+
2223
from lxml import etree
24+
2325
from index_transform.devhelp_qch import convert_devhelp_to_qch
2426

2527

export.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
'''
2020

2121
import argparse
22+
import json
2223
import urllib.parse
2324
import urllib.request
24-
import json
2525

2626

2727
def retrieve_page_names(root, ns_index):

fix_devhelp-links.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@
1919
'''
2020

2121
import sys
22+
2223
import lxml.etree as e
23-
from link_map import LinkMap
2424

25+
from link_map import LinkMap
2526

2627
if len(sys.argv) != 3:
2728
print('''Please provide the following 2 argument:

gadgets/replace_tests_base.py

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import re
2525
import sys
2626

27+
2728
def get_html_files(root):
2829
files = []
2930
for dir, dirnames, filenames in os.walk(root):

gadgets/standard_revisions_tests/base.py

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
'''
1919

2020
import unittest
21+
2122
from selenium import webdriver
2223
from selenium.webdriver.support.ui import Select
2324

gadgets/sync_tests_mwiki.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@
2929
# command line.
3030
os.environ['PYWIKIBOT2_NO_USER_CONFIG']='1'
3131

32-
import pywikibot
33-
import pywikibot.config2
34-
import pywikibot.pagegenerators
35-
import pywikibot.data.api
36-
3732
import argparse
3833
import itertools
3934
import shutil
4035
import sys
4136
import urllib
4237

38+
import pywikibot
39+
import pywikibot.config2
40+
import pywikibot.data.api
41+
import pywikibot.pagegenerators
42+
4343
SYNC_DIRECTION_UPLOAD = 1
4444
SYNC_DIRECTION_DOWNLOAD = 2
4545

images/math-atan2.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
# You should have received a copy of the GNU General Public License
1818
# along with this program. If not, see http://www.gnu.org/licenses/.
1919

20+
import math
21+
import os
22+
import pprint
23+
2024
import matplotlib.cm as cm
2125
import matplotlib.colors as colors
2226
import matplotlib.pyplot as plt
23-
24-
import os
2527
import numpy as np
26-
import math
27-
import pprint
2828

2929
font = {'family' : 'DejaVu Sans',
3030
'weight' : 'normal',

images/math.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
# You should have received a copy of the GNU General Public License
1717
# along with this program. If not, see http://www.gnu.org/licenses/.
1818

19-
import matplotlib.pyplot as plt
2019
import os
21-
from numpy import *
2220
from bisect import *
2321

22+
import matplotlib.pyplot as plt
23+
from numpy import *
24+
2425
#
2526
# DATA - array of items describing data to plot
2627
# Each item consists of the following parts

index-functions-c.xml

+11-26
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<const name="PRIdFAST32" link="c/types/integer"/>
126126
<const name="PRIdFAST64" link="c/types/integer"/>
127127
<const name="PRIdMAX" link="c/types/integer"/>
128-
<const name="PRIdPTR " link="c/types/integer"/>
128+
<const name="PRIdPTR" link="c/types/integer"/>
129129

130130
<const name="PRIi8" link="c/types/integer"/>
131131
<const name="PRIi16" link="c/types/integer"/>
@@ -140,7 +140,7 @@
140140
<const name="PRIiFAST32" link="c/types/integer"/>
141141
<const name="PRIiFAST64" link="c/types/integer"/>
142142
<const name="PRIiMAX" link="c/types/integer"/>
143-
<const name="PRIiPTR " link="c/types/integer"/>
143+
<const name="PRIiPTR" link="c/types/integer"/>
144144

145145
<const name="PRIu8" link="c/types/integer"/>
146146
<const name="PRIu16" link="c/types/integer"/>
@@ -155,7 +155,7 @@
155155
<const name="PRIuFAST32" link="c/types/integer"/>
156156
<const name="PRIuFAST64" link="c/types/integer"/>
157157
<const name="PRIuMAX" link="c/types/integer"/>
158-
<const name="PRIuPTR " link="c/types/integer"/>
158+
<const name="PRIuPTR" link="c/types/integer"/>
159159

160160
<const name="PRIo8" link="c/types/integer"/>
161161
<const name="PRIo16" link="c/types/integer"/>
@@ -170,7 +170,7 @@
170170
<const name="PRIoFAST32" link="c/types/integer"/>
171171
<const name="PRIoFAST64" link="c/types/integer"/>
172172
<const name="PRIoMAX" link="c/types/integer"/>
173-
<const name="PRIoPTR " link="c/types/integer"/>
173+
<const name="PRIoPTR" link="c/types/integer"/>
174174

175175
<const name="PRIx8" link="c/types/integer"/>
176176
<const name="PRIx16" link="c/types/integer"/>
@@ -185,7 +185,7 @@
185185
<const name="PRIxFAST32" link="c/types/integer"/>
186186
<const name="PRIxFAST64" link="c/types/integer"/>
187187
<const name="PRIxMAX" link="c/types/integer"/>
188-
<const name="PRIxPTR " link="c/types/integer"/>
188+
<const name="PRIxPTR" link="c/types/integer"/>
189189

190190
<const name="PRIX8" link="c/types/integer"/>
191191
<const name="PRIX16" link="c/types/integer"/>
@@ -200,7 +200,7 @@
200200
<const name="PRIXFAST32" link="c/types/integer"/>
201201
<const name="PRIXFAST64" link="c/types/integer"/>
202202
<const name="PRIXMAX" link="c/types/integer"/>
203-
<const name="PRIXPTR " link="c/types/integer"/>
203+
<const name="PRIXPTR" link="c/types/integer"/>
204204

205205
<const name="SCNd8" link="c/types/integer"/>
206206
<const name="SCNd16" link="c/types/integer"/>
@@ -215,7 +215,7 @@
215215
<const name="SCNdFAST32" link="c/types/integer"/>
216216
<const name="SCNdFAST64" link="c/types/integer"/>
217217
<const name="SCNdMAX" link="c/types/integer"/>
218-
<const name="SCNdPTR " link="c/types/integer"/>
218+
<const name="SCNdPTR" link="c/types/integer"/>
219219

220220
<const name="SCNi8" link="c/types/integer"/>
221221
<const name="SCNi16" link="c/types/integer"/>
@@ -230,7 +230,7 @@
230230
<const name="SCNiFAST32" link="c/types/integer"/>
231231
<const name="SCNiFAST64" link="c/types/integer"/>
232232
<const name="SCNiMAX" link="c/types/integer"/>
233-
<const name="SCNiPTR " link="c/types/integer"/>
233+
<const name="SCNiPTR" link="c/types/integer"/>
234234

235235
<const name="SCNu8" link="c/types/integer"/>
236236
<const name="SCNu16" link="c/types/integer"/>
@@ -245,7 +245,7 @@
245245
<const name="SCNuFAST32" link="c/types/integer"/>
246246
<const name="SCNuFAST64" link="c/types/integer"/>
247247
<const name="SCNuMAX" link="c/types/integer"/>
248-
<const name="SCNuPTR " link="c/types/integer"/>
248+
<const name="SCNuPTR" link="c/types/integer"/>
249249

250250
<const name="SCNo8" link="c/types/integer"/>
251251
<const name="SCNo16" link="c/types/integer"/>
@@ -260,7 +260,7 @@
260260
<const name="SCNoFAST32" link="c/types/integer"/>
261261
<const name="SCNoFAST64" link="c/types/integer"/>
262262
<const name="SCNoMAX" link="c/types/integer"/>
263-
<const name="SCNoPTR " link="c/types/integer"/>
263+
<const name="SCNoPTR" link="c/types/integer"/>
264264

265265
<const name="SCNx8" link="c/types/integer"/>
266266
<const name="SCNx16" link="c/types/integer"/>
@@ -275,22 +275,7 @@
275275
<const name="SCNxFAST32" link="c/types/integer"/>
276276
<const name="SCNxFAST64" link="c/types/integer"/>
277277
<const name="SCNxMAX" link="c/types/integer"/>
278-
<const name="SCNxPTR " link="c/types/integer"/>
279-
280-
<const name="SCNX8" link="c/types/integer"/>
281-
<const name="SCNX16" link="c/types/integer"/>
282-
<const name="SCNX32" link="c/types/integer"/>
283-
<const name="SCNX64" link="c/types/integer"/>
284-
<const name="SCNXLEAST8" link="c/types/integer"/>
285-
<const name="SCNXLEAST16" link="c/types/integer"/>
286-
<const name="SCNXLEAST32" link="c/types/integer"/>
287-
<const name="SCNXLEAST64" link="c/types/integer"/>
288-
<const name="SCNXFAST8" link="c/types/integer"/>
289-
<const name="SCNXFAST16" link="c/types/integer"/>
290-
<const name="SCNXFAST32" link="c/types/integer"/>
291-
<const name="SCNXFAST64" link="c/types/integer"/>
292-
<const name="SCNXMAX" link="c/types/integer"/>
293-
<const name="SCNXPTR" link="c/types/integer"/>
278+
<const name="SCNxPTR" link="c/types/integer"/>
294279

295280
<!-- c/types/limits -->
296281
<const name="PTRDIFF_MIN" link="c/types/limits"/>

0 commit comments

Comments
 (0)