Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-13 09:51:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conf fixes

Browse Source
This commit is contained in:
Dimitri John Ledkov 2014-12-18 21:53:00 +00:00
parent ddabeed530
commit 1bab644191
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ubuntutools/config.py
View File

@ -179,6 +179,6 @@ def ubu_email(name=None, email=None, export=True):
encoding = locale.getdefaultlocale()[1] encoding = locale.getdefaultlocale()[1]
if not encoding: if not encoding:
encoding = 'utf-8' encoding = 'utf-8'
if name: if name and isinstance(name, bytes):
name = name.decode(encoding) name = name.decode(encoding)
return name, email return name, email

17
ubuntutools/test/test_config.py
View File

@ -22,7 +22,6 @@ except ImportError:
import os import os
import sys import sys
import locale import locale
from io import BytesIO
try: try:
from StringIO import StringIO from StringIO import StringIO
except: except:
@ -49,7 +48,7 @@ class ConfigTestCase(unittest.TestCase):
} }
if filename not in files: if filename not in files:
raise IOError("No such file or directory: '%s'" % filename) raise IOError("No such file or directory: '%s'" % filename)
return BytesIO(files[filename]) return StringIO(files[filename])
def setUp(self): def setUp(self):
super(ConfigTestCase, self).setUp() super(ConfigTestCase, self).setUp()
@ -57,7 +56,11 @@ class ConfigTestCase(unittest.TestCase):
self.assertRegex = self.assertRegexpMatches self.assertRegex = self.assertRegexpMatches
m = mock.mock_open() m = mock.mock_open()
m.side_effect = self._fake_open m.side_effect = self._fake_open
patcher = mock.patch('__builtin__.open', m) if sys.version_info[0] >= 3:
target = 'builtins.open'
else:
target = '__builtin__.open'
patcher = mock.patch(target, m)
self.addCleanup(patcher.stop) self.addCleanup(patcher.stop)
patcher.start() patcher.start()
@ -77,7 +80,7 @@ class ConfigTestCase(unittest.TestCase):
def clean_environment(self): def clean_environment(self):
self._config_files['system'] = '' self._config_files['system'] = ''
self._config_files['user'] = '' self._config_files['user'] = ''
for k in os.environ.keys(): for k in list(os.environ.keys()):
if k.startswith(('UBUNTUTOOLS_', 'TEST_')): if k.startswith(('UBUNTUTOOLS_', 'TEST_')):
del os.environ[k] del os.environ[k]
@ -231,7 +234,11 @@ class UbuEmailTestCase(unittest.TestCase):
encoding = locale.getdefaultlocale()[1] encoding = locale.getdefaultlocale()[1]
if not encoding: if not encoding:
encoding = 'utf-8' encoding = 'utf-8'
name = 'Jöe Déveloper'
env_name = name
if isinstance(name, bytes):
name = 'Jöe Déveloper'.decode('utf-8') name = 'Jöe Déveloper'.decode('utf-8')
os.environ['DEBFULLNAME'] = name.encode(encoding) env_name = name.encode(encoding)
os.environ['DEBFULLNAME'] = env_name
os.environ['DEBEMAIL'] = email = 'joe@example.net' os.environ['DEBEMAIL'] = email = 'joe@example.net'
self.assertEqual(ubu_email(), (name, email)) self.assertEqual(ubu_email(), (name, email))