Merge pull request #94 from wimglenn/more-stdlib

use stuff which wasnt avail in earlier python versions

aoc_wim/aoc2015/q04.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2015/day/4
 """
 from _md5 import md5
+
 from aocd import data
 
 

aoc_wim/aoc2015/q07.py

@@ -5,8 +5,8 @@
 import operator
 import re
 
-from aocd import data
 import numpy as np
+from aocd import data
 
 
 # TODO: change to use topological sort

aoc_wim/aoc2015/q17.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2015/day/17
 """
 from aocd import data
+
 from aoc_wim.stuff import subset_sum
 
 vals = [int(n) for n in data.splitlines()]

aoc_wim/aoc2015/q22.py

@@ -4,6 +4,7 @@
 """
 from aocd import data
 from fields import Fields
+
 from aoc_wim.search import AStar
 
 

aoc_wim/aoc2016/__init__.py

@@ -1,8 +1,8 @@
 import logging
-from multiprocessing import current_process
+import re
 from _md5 import md5
 from functools import partial
-import re
+from multiprocessing import current_process
 
 
 log = logging.getLogger(__name__)

aoc_wim/aoc2016/q01.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/1
 """
 from aocd import data
+
 from aoc_wim.zgrid import manhattan_distance
 
 

aoc_wim/aoc2016/q02.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/2
 """
 from aocd import data
+
 from aoc_wim.zgrid import ZGrid
 
 

aoc_wim/aoc2016/q05.py

@@ -2,13 +2,15 @@
 --- Day 5: How About a Nice Game of Chess? ---
 https://adventofcode.com/2016/day/5
 """
-from aocd import data
 import os
 from collections import deque
 from concurrent.futures import ProcessPoolExecutor
-from aoc_wim.aoc2016 import md5_miner_q05
 from itertools import count
 
+from aocd import data
+
+from aoc_wim.aoc2016 import md5_miner_q05
+
 
 def main():
     code1 = []

aoc_wim/aoc2016/q05_single_core.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/5
 """
 from _md5 import md5
+
 from aocd import data
 
 

aoc_wim/aoc2016/q06.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/6
 """
 from collections import Counter
+
 from aocd import data
 
 counters = [Counter(x) for x in zip(*data.splitlines())]

aoc_wim/aoc2016/q08.py

@@ -4,6 +4,7 @@
 """
 import numpy as np
 from aocd import data
+
 from aoc_wim.ocr import AOCR
 
 

aoc_wim/aoc2016/q09.py

@@ -2,9 +2,9 @@
 --- Day 9: Explosives in Cyberspace ---
 https://adventofcode.com/2016/day/9
 """
-from collections import deque
-import re
 import logging
+import re
+from collections import deque
 
 from aocd import data
 

aoc_wim/aoc2016/q10.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/10
 """
 from math import prod
+
 from aocd import data
 from parse import parse
 

aoc_wim/aoc2016/q11.py

@@ -6,6 +6,7 @@
 from itertools import product
 
 from aocd import data
+
 from aoc_wim.search import AStar
 
 

aoc_wim/aoc2016/q12.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/12
 """
 from aocd import data
+
 from aoc_wim.aoc2016 import AssembunnyComputer
 
 

aoc_wim/aoc2016/q13.py

@@ -2,10 +2,12 @@
 --- Day 13: A Maze of Twisty Little Cubicles ---
 https://adventofcode.com/2016/day/13
 """
-from aoc_wim.zgrid import ZGrid
-from aocd import data
 from functools import partial
 
+from aocd import data
+
+from aoc_wim.zgrid import ZGrid
+
 
 def wall(z, fav_number):
     if z.real < 0 or z.imag < 0:

aoc_wim/aoc2016/q14.py

@@ -6,11 +6,13 @@
 import re
 from collections import defaultdict
 from collections import deque
+from concurrent.futures import ProcessPoolExecutor
+from itertools import count
+
 from aocd import data
+
 from aoc_wim.aoc2016 import md5_miner_q14a
 from aoc_wim.aoc2016 import md5_miner_q14b
-from concurrent.futures import ProcessPoolExecutor
-from itertools import count
 
 
 def search(data, stretch):

aoc_wim/aoc2016/q14_single_core.py

@@ -3,9 +3,10 @@
 https://adventofcode.com/2016/day/14
 """
 import re
+from _md5 import md5
 from collections import defaultdict
+
 from aocd import data
-from _md5 import md5
 
 
 def search(data, stretch):

aoc_wim/aoc2016/q17.py

@@ -2,8 +2,9 @@
 --- Day 17: Two Steps Forward ---
 https://adventofcode.com/2016/day/17
 """
-from collections import deque
 from _md5 import md5
+from collections import deque
+
 from aocd import data
 
 

aoc_wim/aoc2016/q23.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/23
 """
 from aocd import data
+
 from aoc_wim.aoc2016 import AssembunnyComputer
 
 

aoc_wim/aoc2016/q24.py

@@ -2,12 +2,14 @@
 --- Day 24: Air Duct Spelunking ---
 https://adventofcode.com/2016/day/24
 """
-from aoc_wim.zgrid import ZGrid
 from itertools import combinations
 from itertools import permutations
+
 import networkx as nx
 from aocd import data
 
+from aoc_wim.zgrid import ZGrid
+
 grid = ZGrid(data, on=".", off="#")
 graph = grid.graph(extra="0123456789")
 distances = {}

aoc_wim/aoc2016/q25.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2016/day/25
 """
 import re
+
 from aocd import data
 
 x, y = re.findall(r"\d+", data)[:2]

aoc_wim/aoc2017/q03.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2017/day/3
 """
 from aocd import data
+
 from aoc_wim.zgrid import manhattan_distance
 
 

aoc_wim/aoc2017/q07.py

@@ -6,7 +6,6 @@
 from collections import deque
 
 from aocd import data
-from wimpy import cached_property
 
 
 class Node:
@@ -16,7 +15,7 @@ def __init__(self, name):
         self.parent = None
         self.children = []
 
-    @cached_property
+    @property
     def rweight(self):
         return self.weight + sum(x.rweight for x in self.children)
 

aoc_wim/aoc2017/q11.py

@@ -2,9 +2,10 @@
 --- Day 11: Hex Ed ---
 https://adventofcode.com/2017/day/11
 """
-from aoc_wim import zgrid
 from aocd import data
 
+from aoc_wim import zgrid
+
 z = d = dmax = 0
 grid = zgrid.ZGrid({z: 1})
 for step in data.split(","):

aoc_wim/aoc2017/q18.py

@@ -2,8 +2,10 @@
 --- Day 18: Duet ---
 https://adventofcode.com/2017/day/18
 """
-from aocd import data
 from collections import deque
+
+from aocd import data
+
 from aoc_wim.aoc2017 import Comp
 
 # import logging; logging.basicConfig(format="%(message)s", level=logging.DEBUG)

aoc_wim/aoc2017/q19.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2017/day/19
 """
 from aocd import data
+
 from aoc_wim.zgrid import ZGrid
 
 

aoc_wim/aoc2017/q20.py

@@ -3,14 +3,14 @@
 https://adventofcode.com/2017/day/20
 """
 from collections import defaultdict
+from itertools import batched
 
 from aocd import data
 from parse import parse
-from wimpy import chunks
 
 
 def key(p):
-    return [abs(x) + abs(y) + abs(z) for x, y, z in chunks(reversed(p), 3)]
+    return [abs(x) + abs(y) + abs(z) for x, y, z in batched(reversed(p), 3)]
 
 
 def abs_accel(p):

aoc_wim/aoc2017/q23.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2017/day/23
 """
 from aocd import data
+
 from aoc_wim.aoc2017 import Comp
 
 # import logging; logging.basicConfig(format="%(message)s", level=logging.DEBUG)

aoc_wim/aoc2018/q06.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2018/day/6
 """
 from io import StringIO
+
 import numpy as np
 from aocd import data
 

aoc_wim/aoc2018/q10.py

@@ -3,8 +3,10 @@
 https://adventofcode.com/2018/day/10
 """
 import re
+
 import numpy as np
 from aocd import data
+
 from aoc_wim.ocr import AOCR
 from aoc_wim.zgrid import ZGrid
 

aoc_wim/aoc2018/q18.py

@@ -3,6 +3,7 @@
 https://adventofcode.com/2018/day/18
 """
 import time
+
 import numpy as np
 from aocd import data
 from scipy.signal import convolve2d

aoc_wim/aoc2018/q19.py

@@ -3,7 +3,9 @@
 https://adventofcode.com/2018/day/19
 """
 import math
+
 from aocd import data
+
 from aoc_wim.aoc2018.q16 import all_ops
 
 

aoc_wim/aoc2018/q20.py

@@ -4,6 +4,7 @@
 """
 import networkx as nx
 from aocd import data
+
 from aoc_wim.zgrid import manhattan_distance
 from aoc_wim.zgrid import ZGrid
 

aoc_wim/aoc2018/q22.py

@@ -4,9 +4,10 @@
 """
 from aocd import data
 from parse import parse
+
 from aoc_wim.search import AStar
-from aoc_wim.zgrid import zrange
 from aoc_wim.zgrid import manhattan_distance
+from aoc_wim.zgrid import zrange
 
 
 # TODO: use zgrid

aoc_wim/aoc2018/q23.py

@@ -2,11 +2,11 @@
 --- Day 23: Experimental Emergency Teleportation ---
 https://adventofcode.com/2018/day/23
 """
+import math
 from heapq import heappop
 from heapq import heappush
 from itertools import product
 
-import math
 import numpy as np
 from aocd import data
 from parse import parse