From: Roy Williams <rwilliams@lyft.com>
Date: Sat, 27 May 2017 00:04:27 +0000 (-0700)
Subject: Fix an invalid string to bytes comparison in Python 3
X-Git-Tag: v2.5.0~6^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F498%2Fhead;p=thirdparty%2Fbabel.git

Fix an invalid string to bytes comparison in Python 3

In Python 3 this branch would never evaluate to `True` due to comparing a string to bytes.

This was flagged by running some unit tests with the `-bb` flag, so I've added
`-bb` to run with the babel unit tests in Python3.5

Here's some docs on the `-bb` flag:
https://docs.python.org/3.5/library/warnings.html#default-warning-filters
https://docs.python.org/3/howto/pyporting.html#use-continuous-integration-to-stay-compatible
---

diff --git a/.travis.yml b/.travis.yml
index 08ac545d..1f690426 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,8 @@ matrix:
       python: 3.4
     - os: linux
       python: 3.5
+      env:
+      - PYTHON_TEST_FLAGS=-bb
 
 install:
   - bash .ci/deps.${TRAVIS_OS_NAME}.sh
diff --git a/Makefile b/Makefile
index 74b9a673..eafaeb48 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 test: import-cldr
-	@PYTHONWARNINGS=default python -m pytest
+	@PYTHONWARNINGS=default python ${PYTHON_TEST_FLAGS} -m pytest
 
 test-cov: import-cldr
-	@PYTHONWARNINGS=default python -m pytest --cov=babel
+	@PYTHONWARNINGS=default python ${PYTHON_TEST_FLAGS} -m pytest --cov=babel
 
 test-env:
 	@virtualenv test-env
diff --git a/babel/localtime/_unix.py b/babel/localtime/_unix.py
index e0b54fb2..8a8b4e96 100644
--- a/babel/localtime/_unix.py
+++ b/babel/localtime/_unix.py
@@ -87,7 +87,7 @@ def _get_localzone(_root='/'):
 
             # Issue #3 in tzlocal was that /etc/timezone was a zoneinfo file.
             # That's a misconfiguration, but we need to handle it gracefully:
-            if data[:5] != 'TZif2':
+            if data[:5] != b'TZif2':
                 etctz = data.strip().decode()
                 # Get rid of host definitions and comments:
                 if ' ' in etctz: