From db35ffe72e1ad0e28b3779f53d2da45d561a1d6c Mon Sep 17 00:00:00 2001
From: Ross McFarland <ross@github.com>
Date: Mon, 19 Jun 2017 22:17:48 -0700
Subject: [PATCH] Replace my custom natrual sorting with natsort module

Better to use something real/tested and less likely buggy/limited.
---
 octodns/yaml.py  | 21 ++++-----------------
 requirements.txt |  1 +
 setup.py         |  1 +
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/octodns/yaml.py b/octodns/yaml.py
index 2cab58c..d4ab541 100644
--- a/octodns/yaml.py
+++ b/octodns/yaml.py
@@ -5,25 +5,12 @@
 from __future__ import absolute_import, division, print_function, \
     unicode_literals
 
+from natsort import natsort_keygen
 from yaml import SafeDumper, SafeLoader, load, dump
 from yaml.constructor import ConstructorError
-import re
 
 
-# zero-padded sort, simplified version of
-# https://www.xormedia.com/natural-sort-order-with-zero-padding/
-_pad_re = re.compile('\d+')
-
-
-def _zero_pad(match):
-    return '{:04d}'.format(int(match.group(0)))
-
-
-def _zero_padded_numbers(s):
-    try:
-        int(s)
-    except ValueError:
-        return _pad_re.sub(lambda d: _zero_pad(d), s)
+_natsort_key = natsort_keygen()
 
 
 # Found http://stackoverflow.com/a/21912744 which guided me on how to hook in
@@ -34,7 +21,7 @@ class SortEnforcingLoader(SafeLoader):
         self.flatten_mapping(node)
         ret = self.construct_pairs(node)
         keys = [d[0] for d in ret]
-        if keys != sorted(keys, key=_zero_padded_numbers):
+        if keys != sorted(keys, key=_natsort_key):
             raise ConstructorError(None, None, "keys out of order: {}"
                                    .format(', '.join(keys)), node.start_mark)
         return dict(ret)
@@ -59,7 +46,7 @@ class SortingDumper(SafeDumper):
 
     def _representer(self, data):
         data = data.items()
-        data.sort(key=lambda d: _zero_padded_numbers(d[0]))
+        data.sort(key=lambda d: _natsort_key(d[0]))
         return self.represent_mapping(self.DEFAULT_MAPPING_TAG, data)
 
 
diff --git a/requirements.txt b/requirements.txt
index efd7577..b10ca4c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,6 +10,7 @@ futures==3.0.5
 incf.countryutils==1.0
 ipaddress==1.0.18
 jmespath==0.9.0
+natsort==5.0.3
 nsone==0.9.10
 python-dateutil==2.6.0
 requests==2.13.0
diff --git a/setup.py b/setup.py
index ebb4092..f2b901d 100644
--- a/setup.py
+++ b/setup.py
@@ -34,6 +34,7 @@ setup(
         'futures>=3.0.5',
         'incf.countryutils>=1.0',
         'ipaddress>=1.0.18',
+        'natsort>=5.0.3',
         'python-dateutil>=2.6.0',
         'requests>=2.13.0'
     ],