Merge pull request #9 from Paramount/master

dont fix sexadecimal numbers in CommentedMaps
funkwerk · Jul 27, 2019 · a773745 · a773745
2 parents 2f02ca8 + d9b61fb
commit a773745
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: python
 python:
-  - "3.3"
   - "3.4"
+  - "3.5"
 # TODO: pylint ruamel.yaml doesn't work on travis with this version  - "3.5"
 # TODO: pylint ruamel.yaml doesn't work on travis with this version  - "3.5-dev"
 before_install:

diff --git a/Rakefile b/Rakefile
@@ -14,7 +14,7 @@ end
 desc 'Checks style'
 task audit: :rubocop
 task :audit do
-  ignores = %w(D100 D101 D102 D103 D104 E501 I201 N806)
+  ignores = %w(D100 D101 D102 D103 D104 E501 I201 N806 W605)
 
   FILES = FileList[%w(bin/compose_format compose_format/*.py setup.py)]
   sh "flake8 --ignore='#{ignores * ','}' #{FILES}"

diff --git a/compose_format/__init__.py b/compose_format/__init__.py
@@ -101,7 +101,8 @@ def reorder(data, strict=True):
             return data
         if type(data) is CommentedSeq:
             for i, value in enumerate(data):
-                data[i] = ComposeFormat.fix_sexadecimal_numbers(value)
+                if type(value) is not CommentedMap:
+                    data[i] = ComposeFormat.fix_sexadecimal_numbers(value)
             data.sort()
             return data
         return data