Skip to content

Commit 9a67a4a

Browse files
authored
Merge pull request #156 from dpath-maintainers/feature/drop-python-2
Feature/drop python 2
2 parents a4e6a7a + edda50f commit 9a67a4a

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

dpath/segments.py

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,7 @@ def leaves(obj):
139139
def int_str(segment):
140140
'''
141141
If the segment is an integer, return the string conversion.
142-
Otherwise return the segment unchanged. The conversion uses 'str'
143-
which means that:
144-
145-
* in Python 2.x: 0 -> b'0'
146-
* in Python 3.x: 0 -> u'0'
142+
Otherwise return the segment unchanged. The conversion uses 'str'.
147143
148144
int_str(segment) -> str
149145
'''
@@ -180,15 +176,6 @@ def match(segments, glob):
180176
fnmatch.fnmatchcase returns True. If fnmatchcase returns False or
181177
throws an exception the result will be False.
182178
183-
A Word of Caution:
184-
185-
*** Globs can have different results between Python 2.x and 3.x. ***
186-
187-
fnmatchcase differs in behavior between Python 2.x and 3.x with
188-
regard to handling comparison between different types (e.g. bytes
189-
and unicode). In 2.x it will attempt the comparison implicitly
190-
converting, but in 3.x it will throw an exception.
191-
192179
match(segments, glob) -> bool
193180
'''
194181
segments = tuple(segments)

dpath/version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
VERSION = "2.0.3"
1+
VERSION = "2.0.4"

setup.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
'Intended Audience :: Developers',
3333
'License :: OSI Approved :: MIT License',
3434
'Natural Language :: English',
35-
'Programming Language :: Python :: 2.7',
3635
'Programming Language :: Python :: 3',
3736
'Topic :: Software Development :: Libraries :: Python Modules',
3837
],

0 commit comments

Comments
 (0)