diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastermain/settings.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastermain/settings.py b/bitbake/lib/toaster/toastermain/settings.py index c7edff2f61..3dfa2b2238 100644 --- a/bitbake/lib/toaster/toastermain/settings.py +++ b/bitbake/lib/toaster/toastermain/settings.py | |||
@@ -87,17 +87,16 @@ else: | |||
87 | try: | 87 | try: |
88 | import pytz | 88 | import pytz |
89 | from pytz.exceptions import UnknownTimeZoneError | 89 | from pytz.exceptions import UnknownTimeZoneError |
90 | pass | ||
91 | try: | 90 | try: |
92 | if pytz.timezone(zonename) is not None: | 91 | if pytz.timezone(zonename) is not None: |
93 | zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename | 92 | zonefilelist[hashlib.md5(open(filepath, 'rb').read()).hexdigest()] = zonename |
94 | except UnknownTimeZoneError as ValueError: | 93 | except UnknownTimeZoneError as ValueError: |
95 | # we expect timezone failures here, just move over | 94 | # we expect timezone failures here, just move over |
96 | pass | 95 | pass |
97 | except ImportError: | 96 | except ImportError: |
98 | zonefilelist[hashlib.md5(open(filepath).read()).hexdigest()] = zonename | 97 | zonefilelist[hashlib.md5(open(filepath, 'rb').read()).hexdigest()] = zonename |
99 | 98 | ||
100 | TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime').read()).hexdigest()] | 99 | TIME_ZONE = zonefilelist[hashlib.md5(open('/etc/localtime', 'rb').read()).hexdigest()] |
101 | 100 | ||
102 | # Language code for this installation. All choices can be found here: | 101 | # Language code for this installation. All choices can be found here: |
103 | # http://www.i18nguy.com/unicode/language-identifiers.html | 102 | # http://www.i18nguy.com/unicode/language-identifiers.html |