Skip to content

Commit

Permalink
bumped version to 0.3.37 and added an extra test for pop
Browse files Browse the repository at this point in the history
  • Loading branch information
darthbear committed Sep 24, 2017
1 parent 5022a17 commit 3795e2e
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 2 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

# Version 0.3.37

* Dropped support for Python 2.6 (wheel)
* Fixed get_xxx() methods to return None if the value is None. PR [#128]
* Added required includes. PR[#127]
* Config tree fix for pop. PR[#126]
* Handle None value for converting methods. PR[#124]
* ConfigTree.pop() should delete key when value == default_value. PR[#123]

# Version 0.3.36

* Fixed tripled quoted string parsing bug. PR [#119]
Expand Down
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,8 @@ Java properties mapping | :x:
- atomerju ([@atomerju](https://github.com/atomerju))
- Nick Gerow ([@NickG123](https://github.com/NickG123))
- jjtk88 ([@jjtk88](https://github.com/jjtk88))
- Aki Ariga ([@chezou](https://github.com/chezou))
- Joel Grus ([@joelgrus](https://github.com/joelgrus))

### Thanks

Expand All @@ -350,4 +352,6 @@ Java properties mapping | :x:
- Alexey Terentiev ([@alexey-terentiev](https://github.com/alexey-terentiev))
- Prashant Shewale ([@pvshewale](https://github.com/pvshewale))
- mh312 ([@mh321](https://github.com/mh321))
- farquet ([@farquet](https://github.com/farquet))
- François Farquet ([@farquet](https://github.com/farquet))
- Gavin Bisesi ([@Daenyth](https://github.com/Daenyth))
- Cosmin Basca ([@cosminbasca](https://github.com/cosminbasca))
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def run_tests(self):

setup(
name='pyhocon',
version='0.3.36',
version='0.3.37',
description='HOCON parser for Python',
long_description='pyhocon is a HOCON parser for Python. Additionally we provide a tool (pyhocon) to convert any HOCON '
'content into json, yaml and properties format.',
Expand Down
8 changes: 8 additions & 0 deletions tests/test_config_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -1970,3 +1970,11 @@ def test_triple_quotes_same_line(self):
assert config_tree == {
'a': ['foo"', "bar"]
}

def test_pop(self):
config_tree = ConfigFactory.parse_string('a:{b: 3, d: 6}')
assert 3 == config_tree.pop('a.b', 5)
assert 5 == config_tree.pop('a.c', 5)
assert {
'a': {'d': 6}
} == config_tree

0 comments on commit 3795e2e

Please sign in to comment.