Merge lp:~robru/cupstream2distro/drop-safe-join into lp:cupstream2distro

[Robert Bruce Park]

Drop os_path_join_safe crutch now that path chaos has settled.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'citrain/setup_citrain.py'
--- citrain/setup_citrain.py	2015-08-22 04:36:15 +0000
+++ citrain/setup_citrain.py	2015-09-10 02:16:41 +0000
@@ -32,10 +32,11 @@
 
 sys.path.append(os.path.dirname(os.path.dirname(__file__)))
 
+from os.path import dirname, expanduser, join
+
 from cupstream2distro.launchpadmanager import lp
 from cupstream2distro.utils import (
     log_value_of,
-    os_path_join_safe,
     run_script,
     suppress,
     utf8_open,
@@ -51,9 +52,8 @@
 )
 
 
-JOBS_DIR = os.path.expanduser(os_path_join_safe('~', 'jobs'))
-TEMPLATE_DIR = os_path_join_safe(
-    os.path.dirname(__file__), 'jenkins-templates')
+JOBS_DIR = expanduser(join('~', 'jobs'))
+TEMPLATE_DIR = join(dirname(__file__), 'jenkins-templates')
 
 
 def discover_silos():
@@ -78,7 +78,7 @@
 
 def load_template(template_name, context):
     """Load the template from disk and fill out string format variables."""
-    with utf8_open(os_path_join_safe(TEMPLATE_DIR, template_name)) as templ:
+    with utf8_open(join(TEMPLATE_DIR, template_name)) as templ:
         return templ.read().format(**context)
 
 
@@ -89,8 +89,8 @@
     log_value_of.template_name()
     context['BINDIR'] = CITRAIN_BINDIR
     context['RSYNC_OUTDIR'] = SILO_RSYNCDIR
-    jobdir = os_path_join_safe(JOBS_DIR, jobname)
-    config_file = os_path_join_safe(jobdir, 'config.xml')
+    jobdir = join(JOBS_DIR, jobname)
+    config_file = join(jobdir, 'config.xml')
     with suppress(OSError):
         os.makedirs(jobdir)
     with utf8_open(config_file, 'w') as data:

=== modified file 'cupstream2distro/archive.py'
--- cupstream2distro/archive.py	2015-08-22 04:53:32 +0000
+++ cupstream2distro/archive.py	2015-09-10 02:16:41 +0000
@@ -20,6 +20,7 @@
 import shutil
 import logging
 
+from os.path import join
 from operator import attrgetter
 from six.moves.urllib.parse import unquote
 from six.moves.urllib.request import urlretrieve
@@ -29,7 +30,6 @@
 from cupstream2distro.utils import (
     log_call,
     log_value_of,
-    os_path_join_safe,
     suppress,
 )
 
@@ -132,7 +132,7 @@
         version = source.source_package_version
         logging.info('Downloading {} to {}'.format(source.display_name, path))
         for url in source.sourceFileUrls():
-            filepath = os_path_join_safe(path, unquote(url.split('/')[-1]))
+            filepath = join(path, unquote(url.split('/')[-1]))
             if V(version).get_upstream() in filepath:
                 urlretrieve(url, filepath)
         return self.unpack_archive_dsc(path, version.split(':')[-1])
@@ -144,9 +144,9 @@
         :param path: The directory containing the dsc file(s).
         :returns: The name of the unpacked directory.
         """
-        dsc = os_path_join_safe(path, '{}_{}.dsc'.format(self.name, version))
+        dsc = join(path, '{}_{}.dsc'.format(self.name, version))
         instance = log_call(['dpkg-source', '-x', dsc], cwd=path)[0]
-        shortname = os_path_join_safe(path, self.name)
+        shortname = join(path, self.name)
         fullname = '{}-{}'.format(shortname, V(version).get_upstream())
         if not os.path.isdir(fullname) or instance.returncode != 0:
             raise ArchiveError('Download failed: {}'.format(fullname))

=== modified file 'cupstream2distro/launchpadmanager.py'
--- cupstream2distro/launchpadmanager.py	2015-09-05 01:35:22 +0000
+++ cupstream2distro/launchpadmanager.py	2015-09-10 02:16:41 +0000
@@ -18,14 +18,14 @@
 
 import os
 
+from os.path import expanduser, join
 from launchpadlib.launchpad import Launchpad
 
-from cupstream2distro.utils import env, memoize, os_path_join_safe, singleton
+from cupstream2distro.utils import env, memoize, singleton
 from cupstream2distro.settings import COMMON_LAUNCHPAD_CACHE_DIR
 
 
-CREDS_PATH = os.path.expanduser(
-    os_path_join_safe('~', '.launchpad.credentials'))
+CREDS_PATH = expanduser(join('~', '.launchpad.credentials'))
 
 
 MP_ROOT = 'https://code.launchpad.net/'
@@ -78,8 +78,7 @@
     # as launchpadlib isn't multiproc, fiddling the cache dir if any
     launchpadlib_dir = None
     if env.JOB_NAME:
-        launchpadlib_dir = os_path_join_safe(
-            COMMON_LAUNCHPAD_CACHE_DIR, env.JOB_NAME)
+        launchpadlib_dir = join(COMMON_LAUNCHPAD_CACHE_DIR, env.JOB_NAME)
     login_args = dict(
         application_name='cupstream2distro',
         service_root='staging' if use_staging else 'production',

=== modified file 'cupstream2distro/packagemanager.py'
--- cupstream2distro/packagemanager.py	2015-09-02 23:09:21 +0000
+++ cupstream2distro/packagemanager.py	2015-09-10 02:16:41 +0000
@@ -20,7 +20,7 @@
 import re
 import os
 
-from os.path import basename, dirname
+from os.path import basename, dirname, join
 from glob import glob
 
 from cupstream2distro.version import V
@@ -38,7 +38,6 @@
     env,
     log_call,
     log_value_of,
-    os_path_join_safe,
     utf8_inplace,
     utf8_open,
 )
@@ -130,17 +129,17 @@
     @property
     def debian(self):
         """Locate debian/ directory."""
-        return os_path_join_safe(self.path, 'debian')
+        return join(self.path, 'debian')
 
     @property
     def debian_control(self):
         """Locate debian/control."""
-        return os_path_join_safe(self.debian, 'control')
+        return join(self.debian, 'control')
 
     @property
     def debian_changelog(self):
         """Locate debian/changelog."""
-        return os_path_join_safe(self.debian, 'changelog')
+        return join(self.debian, 'changelog')
 
     def correct_package_changelog(self, version, series):
         """Insert the correct series & version into the changelog.
@@ -205,7 +204,7 @@
         ]
         files = []
         for entry in whitelist:
-            files.extend(glob(os_path_join_safe(self.debian, entry)))
+            files.extend(glob(join(self.debian, entry)))
 
         for path in files:
             if os.path.isfile(path) and not os.path.islink(path):
@@ -224,8 +223,8 @@
 
     def build_package(self, series, distro_version):
         """Build the source package in a chroot."""
-        tool_dir = os_path_join_safe(ROOT_CU2D, 'chroot-tools')
-        buildsource = os_path_join_safe(tool_dir, 'buildsource-chroot')
+        tool_dir = join(ROOT_CU2D, 'chroot-tools')
+        buildsource = join(tool_dir, 'buildsource-chroot')
         environ = os.environ.copy()
         environ.update(HOME=tool_dir, DIST=series)
         log_call(['./create-chroot'], cwd=tool_dir, env=environ)
@@ -251,9 +250,8 @@
     def generate_package_diffs(self, old_dsc, new_dsc):
         """Generate content and packaging-only diffs for this package."""
         parent = dirname(new_dsc)
-        full_path = os_path_join_safe(parent, FULL_DIFF.format(self.name))
-        packaging_path = os_path_join_safe(
-            parent, PACKAGING_DIFF.format(self.name))
+        full_path = join(parent, FULL_DIFF.format(self.name))
+        packaging_path = join(parent, PACKAGING_DIFF.format(self.name))
         full_diff = call(['debdiff', old_dsc or '', new_dsc], cwd=parent)[1]
         with utf8_open(full_path, 'w') as full:
             full.write(full_diff)

=== modified file 'cupstream2distro/project.py'
--- cupstream2distro/project.py	2015-08-22 05:04:58 +0000
+++ cupstream2distro/project.py	2015-09-10 02:16:41 +0000
@@ -16,15 +16,15 @@
 
 """Class for .project files, which store per-package version numbers."""
 
-import glob
 import os
 
+from glob import glob
+from os.path import join
 from six.moves import configparser
 
 from cupstream2distro.utils import (
     SILO_DIR,
     log_value_of,
-    os_path_join_safe,
     suppress,
     utf8_open,
 )
@@ -34,7 +34,7 @@
 
 def _get_project_files(infix):
     """Glob for the project files."""
-    return glob.glob(os_path_join_safe(SILO_DIR(), '*{}'.format(infix)))
+    return glob(join(SILO_DIR(), '*{}'.format(infix)))
 
 
 def _get_state(filename):
@@ -80,15 +80,14 @@
 
     def __init__(self, source_package_name):
         """Identify the location of the .project file."""
-        object.__setattr__(self, 'name', source_package_name)
-        object.__setattr__(self, 'filename', os_path_join_safe(
-            SILO_DIR(), self.name + self.SUFFIX))
+        super().__setattr__('name', source_package_name)
+        super().__setattr__('filename', SILO_DIR(self.name + self.SUFFIX))
 
     @property
     def state(self):
         """Load the .project file from disk if necessary."""
         if not self._state:
-            object.__setattr__(self, '_state', _get_state(self.filename))
+            super().__setattr__('_state', _get_state(self.filename))
         return self._state
 
     def __getattr__(self, key):

=== modified file 'cupstream2distro/utils.py'
--- cupstream2distro/utils.py	2015-09-08 21:24:58 +0000
+++ cupstream2distro/utils.py	2015-09-10 02:16:41 +0000
@@ -28,7 +28,7 @@
 from inspect import currentframe
 from contextlib import contextmanager
 from six.moves.urllib.parse import unquote
-from os.path import basename, isabs, exists, join
+from os.path import basename, exists, join
 
 from cupstream2distro.settings import SILOS_DIR
 
@@ -84,12 +84,6 @@
     return single()
 
 
-def os_path_join_safe(first, *rest):
-    """Raise an exception if you try to join absolute paths together."""
-    assert True not in [isabs(part) for part in rest]
-    return join(first, *rest)
-
-
 @singleton
 class env(object):
     """Handle some common environment variable manipulations."""
@@ -120,7 +114,7 @@
 
 def SILO_DIR(*parts):
     """Return the directory of the currently active silo."""
-    return os_path_join_safe(SILOS_DIR, env.SILONAME, *parts)
+    return join(SILOS_DIR, env.SILONAME, *parts)
 
 
 @singleton

=== modified file 'tests/unit/__init__.py'
--- tests/unit/__init__.py	2015-09-05 03:54:05 +0000
+++ tests/unit/__init__.py	2015-09-10 02:16:41 +0000
@@ -23,9 +23,10 @@
 import tempfile
 import unittest
 
+from os.path import join
 from mock import Mock
 
-from cupstream2distro.utils import env, os_path_join_safe, suppress, utf8_open
+from cupstream2distro.utils import env, suppress, utf8_open
 
 
 def clean(line):
@@ -38,13 +39,13 @@
     maxDiff = None
     _tempdir = None
     test_dir = os.path.dirname(os.path.dirname(__file__))
-    data_dir = os_path_join_safe(test_dir, 'data')
-    changelogs_file_dir = os_path_join_safe(data_dir, 'changelogs')
-    result_dir = os_path_join_safe(data_dir, 'results')
-    project_file_dir = os_path_join_safe(data_dir, 'project_files')
+    data_dir = join(test_dir, 'data')
+    changelogs_dir = join(data_dir, 'changelogs')
+    result_dir = join(data_dir, 'results')
+    project_file_dir = join(data_dir, 'project_files')
     root_dir = os.path.dirname(test_dir)
-    train_dir = os_path_join_safe(root_dir, 'citrain')
-    cup_dir = os_path_join_safe(root_dir, 'cupstream2distro')
+    train_dir = join(root_dir, 'citrain')
+    cup_dir = join(root_dir, 'cupstream2distro')
 
     def setUp(self):
         """Time how long each test runs."""
@@ -96,7 +97,7 @@
 
     def prep_debian_file(self, filename, content):
         """Prepare a file for modification."""
-        path = os_path_join_safe(self.tempdir, 'debian', filename)
+        path = join(self.tempdir, 'debian', filename)
         with suppress(OSError):
             os.mkdir(os.path.dirname(path))
         with utf8_open(path, 'w') as f:
@@ -133,7 +134,7 @@
         if self.scriptname:
             self.script = imp.load_source(
                 os.path.basename(self.scriptname).split('.')[0],
-                os_path_join_safe(self.train_dir, self.scriptname))
+                join(self.train_dir, self.scriptname))
             self.script.Archive = Mock()
             self.script.Branch = Mock()
             self.script.DotProject = Mock()
@@ -157,8 +158,7 @@
             self.script.shutil = Mock()
             self.script.silo_state = Mock()
             self.script.time = Mock()
-            self.script.SILO_DIR = lambda *parts: os_path_join_safe(
-                self.tempdir, *parts)
+            self.script.SILO_DIR = lambda *parts: join(self.tempdir, *parts)
             self.script.ALL_SILO_NAMES = [
                 'ubuntu/landing-{:03d}'.format(x) for x in range(0, 10)]
             self.script.SILO_NAME_LIST = dict(

=== modified file 'tests/unit/test_archive.py'
--- tests/unit/test_archive.py	2015-08-30 08:24:36 +0000
+++ tests/unit/test_archive.py	2015-09-10 02:16:41 +0000
@@ -16,6 +16,7 @@
 
 """Tests for launchpadlib archive-related functions."""
 
+from os.path import join
 from datetime import datetime
 from mock import Mock, patch, call
 
@@ -25,7 +26,6 @@
 from cupstream2distro import archive
 from cupstream2distro.archive import Archive, ArchWatcher
 from cupstream2distro.errors import ArchiveError
-from cupstream2distro.utils import os_path_join_safe
 
 
 class DistroArchSeries(object):
@@ -260,8 +260,8 @@
         log_call.return_value = Mock(returncode=0), '', ''
         self.assertEqual(
             self.archive.unpack_archive_dsc(self.tempdir, '1.0-0ubuntu1'),
-            os_path_join_safe(self.tempdir, 'dl'))
-        shortname = os_path_join_safe(self.tempdir, 'dl')
+            join(self.tempdir, 'dl'))
+        shortname = join(self.tempdir, 'dl')
         fullname = shortname + '-1.0'
         log_call.assert_called_once_with(
             ['dpkg-source', '-x', shortname + '_1.0-0ubuntu1.dsc'],
@@ -276,11 +276,11 @@
         self.archive.name = 'dl'
         os_mock.path.isdir.return_value = True
         log_call.return_value = Mock(returncode=0), '', ''
-        path = os_path_join_safe(self.tempdir, 'ubuntu', 'dl')
+        path = join(self.tempdir, 'ubuntu', 'dl')
         self.assertEqual(
             self.archive.unpack_archive_dsc(path, '1.0-0ubuntu1'),
-            os_path_join_safe(path, 'dl-1.0'))
-        shortname = os_path_join_safe(path, 'dl')
+            join(path, 'dl-1.0'))
+        shortname = join(path, 'dl')
         log_call.assert_called_once_with(
             ['dpkg-source', '-x', shortname + '_1.0-0ubuntu1.dsc'],
             cwd=path)
@@ -293,7 +293,7 @@
         self.archive.name = 'dl'
         os_mock.path.isdir.return_value = False
         log_call.return_value = Mock(returncode=0), '', ''
-        path = os_path_join_safe(self.tempdir, 'ubuntu', 'dl')
+        path = join(self.tempdir, 'ubuntu', 'dl')
         with self.assertRaisesRegexp(ArchiveError, 'Download failed'):
             self.archive.unpack_archive_dsc(path, '1.0-0ubuntu1')
 
@@ -304,7 +304,7 @@
         self.archive.name = 'dl'
         os_mock.path.isdir.return_value = True
         log_call.return_value = Mock(returncode=1), '', ''
-        path = os_path_join_safe(self.tempdir, 'ubuntu', 'dl')
+        path = join(self.tempdir, 'ubuntu', 'dl')
         with self.assertRaisesRegexp(ArchiveError, 'Download failed'):
             self.archive.unpack_archive_dsc(path, '1.0-0ubuntu1')
 

=== modified file 'tests/unit/test_branchhandling.py'
--- tests/unit/test_branchhandling.py	2015-09-09 00:14:07 +0000
+++ tests/unit/test_branchhandling.py	2015-09-10 02:16:41 +0000
@@ -16,15 +16,16 @@
 
 """Tests for bzr branch related functions."""
 
+from os.path import join
+from mock import Mock, patch, call
 from six.moves import range as gen_range
-from mock import Mock, patch, call
 
 from tests import strings as s
 from tests.unit import BaseTestCase
 
 from cupstream2distro import branchhandling
+from cupstream2distro.utils import utf8_open
 from cupstream2distro.branchhandling import Branch
-from cupstream2distro.utils import os_path_join_safe, utf8_open
 from cupstream2distro.errors import BranchError, MergeError
 
 
@@ -68,7 +69,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_branching(self, call_mock):
         """We correcly branch a branch."""
-        path = self.branch.path = os_path_join_safe(self.tempdir, 'foo')
+        path = self.branch.path = join(self.tempdir, 'foo')
         call_mock.return_value = (Mock(returncode=0), '', '')
         self.branch.get_branch('lp:foo')
         call_mock.assert_called_once_with(
@@ -77,7 +78,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_branching_failed(self, call_mock):
         """Raise an exception when branching fails."""
-        path = self.branch.path = os_path_join_safe(self.tempdir, 'foo')
+        path = self.branch.path = join(self.tempdir, 'foo')
         call_mock.return_value = (Mock(returncode=42), '', 'intarwebz broked.')
         with self.assertRaisesRegexp(BranchError, 'Branching lp:foo failed.'):
             self.branch.get_branch('lp:foo')
@@ -132,7 +133,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_merge_branch_unicode(self, call_mock, tmp_mock):
         """Merging branch accepts unicode."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=0), '', '')
         self.branch.merge_branch('lp:example', '.ʇɹoddns ǝpoɔıun pǝppɐ')
@@ -146,7 +147,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_merge_branch_debcommit(self, call_mock, tmp_mock):
         """Merging branch accepts unicode."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=0), '', '')
         self.branch.merge_branch('lp:example')
@@ -163,7 +164,7 @@
             (Mock(returncode=1), '', ''),
             (Mock(returncode=0), '', ''),
         ]
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.side_effect = lambda *ig, **nore: calls.pop()
         with self.assertRaisesRegexp(MergeError, 'No commit message found'):
@@ -177,7 +178,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_merge_branch_failed(self, call_mock, tmp_mock):
         """Merging raises the appropriate exception when it fails."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=1), '', '')
         with self.assertRaisesRegexp(MergeError, 'Merge conflict'):
@@ -232,7 +233,7 @@
 
     def mock_diff_since_newest_tag(self, filename):
         """Configure mock for use by Branch.get_branch_commits()."""
-        path = os_path_join_safe(self.data_dir, 'bzrlogs', filename)
+        path = join(self.data_dir, 'bzrlogs', filename)
         with utf8_open(path) as branch_log:
             self.branch.diff_since_newest_branch_tag = Mock(
                 return_value=branch_log.read())
@@ -392,7 +393,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_commit_branch(self, call_mock, tmp_mock):
         """Ensure we invoke bzr correctly while committing."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=0), 'Committed to...', '')
         self.branch.commit_branch(
@@ -406,7 +407,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_commit_branch_failed(self, call_mock, tmp_mock):
         """Ensure we raise the appropriate error when committing fails."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=1), '', 'borked')
         with self.assertRaisesRegexp(BranchError, 'Failed to commit'):
@@ -420,7 +421,7 @@
     @patch('cupstream2distro.branchhandling.log_call')
     def test_commit_branch_failed_unchanged_ok(self, call_mock, tmp_mock):
         """Happily ignore failures to commit when not creating empty commit."""
-        tmpfile = os_path_join_safe(self.tempdir, 'tempfile')
+        tmpfile = join(self.tempdir, 'tempfile')
         tmp_mock.return_value = (0, tmpfile)
         call_mock.return_value = (Mock(returncode=1), '', 'borked')
         self.branch.commit_branch(

=== modified file 'tests/unit/test_packagelist.py'
--- tests/unit/test_packagelist.py	2015-09-04 03:44:13 +0000
+++ tests/unit/test_packagelist.py	2015-09-10 02:16:41 +0000
@@ -16,14 +16,14 @@
 
 """Tests for CI Train PackageList class."""
 
-from os.path import dirname
+from os.path import dirname, join
 from os import makedirs
 from mock import Mock, patch
 
 from tests.unit import DirectoryAwareTestCase
 
 from cupstream2distro.packagelist import PackageList
-from cupstream2distro.utils import env, os_path_join_safe, utf8_open
+from cupstream2distro.utils import env, utf8_open
 from cupstream2distro.errors import PublishError
 
 API = 'https://api.launchpad.net/devel/'
@@ -120,7 +120,7 @@
             'ci-train-ppa-service/ubuntu/landing-789\tRelease\tvivid'
             '\tProposed\tvivid\tbar\t2.0-0ubuntu1\t0.9\trobru\tubuntu\n',
         ]
-        result_path = os_path_join_safe(
+        result_path = join(
             self.tempdir, 'ubuntu', 'landing-789',
             'packagelist_rsync_ubuntu-landing-789')
         makedirs(dirname(result_path), exist_ok=True)

=== modified file 'tests/unit/test_packagemanager.py'
--- tests/unit/test_packagemanager.py	2015-09-03 00:06:03 +0000
+++ tests/unit/test_packagemanager.py	2015-09-10 02:16:41 +0000
@@ -18,8 +18,9 @@
 
 import os
 
+from os.path import join
+from pprint import pprint
 from mock import Mock, patch, call
-from pprint import pprint
 
 from tests.unit import BaseTestCase
 from tests import strings as s
@@ -27,7 +28,7 @@
 from cupstream2distro import utils
 from cupstream2distro import packagemanager
 from cupstream2distro.packagemanager import Package
-from cupstream2distro.utils import env, os_path_join_safe, utf8_open
+from cupstream2distro.utils import env, utf8_open
 from cupstream2distro.errors import PackageError
 from cupstream2distro.settings import PACKAGING_DIFF, FULL_DIFF
 
@@ -38,17 +39,15 @@
     def setUp(self):
         """Set SILO_DIR to tempdir so we can create files safely."""
         super().setUp()
-        packagemanager.SILO_DIR = lambda *p: os_path_join_safe(
-            self.tempdir, *p)
+        packagemanager.SILO_DIR = lambda *parts: join(self.tempdir, *parts)
         self.package = Package()
         self.package.path = self.tempdir
         self.package.name = 'wheee-doggy'
         self.package.series = Mock()
-        self.bsc = os_path_join_safe(
-            self.root_dir, 'chroot-tools', 'buildsource-chroot')
-        self.full_diff_path = os_path_join_safe(
+        self.bsc = join(self.root_dir, 'chroot-tools', 'buildsource-chroot')
+        self.full_diff_path = join(
             self.tempdir, FULL_DIFF.format('wheee-doggy'))
-        self.pkg_diff_path = os_path_join_safe(
+        self.pkg_diff_path = join(
             self.tempdir, PACKAGING_DIFF.format('wheee-doggy'))
         env.CREATOR_NAME = ''
         env.CREATOR_EMAIL = ''
@@ -106,13 +105,13 @@
         """Ensure properties return correct values."""
         self.assertEqual(
             self.package.debian,
-            os_path_join_safe(self.tempdir, 'debian'))
+            join(self.tempdir, 'debian'))
         self.assertEqual(
             self.package.debian_control,
-            os_path_join_safe(self.tempdir, 'debian', 'control'))
+            join(self.tempdir, 'debian', 'control'))
         self.assertEqual(
             self.package.debian_changelog,
-            os_path_join_safe(self.tempdir, 'debian', 'changelog'))
+            join(self.tempdir, 'debian', 'changelog'))
 
     def test_correct_package_changelog(self):
         """Confirm that we can mangle the most recent changelog entry."""
@@ -259,7 +258,7 @@
     @patch('cupstream2distro.packagemanager.call')
     def test_generate_package_diffs_new_source(self, call_mock):
         """Generate correct packaging diff when source is brand new."""
-        new = os_path_join_safe(self.tempdir, 'new-hotness_2.0.dsc')
+        new = join(self.tempdir, 'new-hotness_2.0.dsc')
         # Only mock the first call; undo the mock for subsequent calls.
         call_mock.side_effect = lambda *ig, **nore: (
             setattr(packagemanager, 'call', utils.call),
@@ -280,8 +279,8 @@
     @patch('cupstream2distro.packagemanager.call')
     def test_generate_package_diffs_no_diff(self, call_mock):
         """Do not generate packaging diff file if there is no diff."""
-        old = os_path_join_safe(self.tempdir, 'old-busted_1.0.dsc')
-        new = os_path_join_safe(self.tempdir, 'new-hotness_2.0.dsc')
+        old = join(self.tempdir, 'old-busted_1.0.dsc')
+        new = join(self.tempdir, 'new-hotness_2.0.dsc')
         # Only mock the first call; undo the mock for subsequent calls.
         call_mock.side_effect = lambda *ig, **nore: (
             setattr(packagemanager, 'call', utils.call),
@@ -298,8 +297,8 @@
     @patch('cupstream2distro.packagemanager.call')
     def test_generate_package_diffs_bluez(self, call_mock):
         """Find packaging changes in a recent bluez landing."""
-        old = os_path_join_safe(self.tempdir, 'old-busted_1.0.dsc')
-        new = os_path_join_safe(self.tempdir, 'new-hotness_2.0.dsc')
+        old = join(self.tempdir, 'old-busted_1.0.dsc')
+        new = join(self.tempdir, 'new-hotness_2.0.dsc')
         # Only mock the first call; undo the mock for subsequent calls.
         call_mock.side_effect = lambda *ig, **nore: (
             setattr(packagemanager, 'call', utils.call),
@@ -319,8 +318,8 @@
     @patch('cupstream2distro.packagemanager.call')
     def test_generate_package_diffs_bluez_with_binary(self, call_mock, binary):
         """Find packaging changes in a recent bluez landing, new binaries."""
-        old = os_path_join_safe(self.tempdir, 'old-busted_1.0.dsc')
-        new = os_path_join_safe(self.tempdir, 'new-hotness_2.0.dsc')
+        old = join(self.tempdir, 'old-busted_1.0.dsc')
+        new = join(self.tempdir, 'new-hotness_2.0.dsc')
         binary.return_value = ['bluez']
         # Only mock the first call; undo the mock for subsequent calls.
         call_mock.side_effect = lambda *ig, **nore: (
@@ -344,8 +343,8 @@
     @patch('cupstream2distro.packagemanager.call')
     def test_generate_package_diffs_with_component(self, call_mock, binary):
         """Find packaging changes in a recent bluez landing, new binaries."""
-        old = os_path_join_safe(self.tempdir, 'old-busted_1.0.dsc')
-        new = os_path_join_safe(self.tempdir, 'new-hotness_2.0.dsc')
+        old = join(self.tempdir, 'old-busted_1.0.dsc')
+        new = join(self.tempdir, 'new-hotness_2.0.dsc')
         binary.return_value = ['bluez']
         # Only mock the first call; undo the mock for subsequent calls.
         call_mock.side_effect = lambda *ig, **nore: (
@@ -376,10 +375,9 @@
 
     def test_collect_bugs_extras(self):
         """Extras syntax case: some bugs in an unreleased changelog."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'different_bugs_pattern')
+        path = join(self.changelogs_dir, 'different_bugs_pattern')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(
                 self.package.collect_package_bugs(),
@@ -394,20 +392,18 @@
 
     def test_collect_bugs_no_unrelease_no_manual(self):
         """No manual upload, no unreleased changelog."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'no_unrelease_no_manual')
+        path = join(self.changelogs_dir, 'no_unrelease_no_manual')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(
                 self.package.collect_package_bugs(), set())
 
     def test_collect_bugs_multiple_unrelease(self):
         """No bug from it in the first snapshot."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'multiple_unrelease')
+        path = join(self.changelogs_dir, 'multiple_unrelease')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(
                 self.package.collect_package_bugs(),
@@ -415,30 +411,27 @@
 
     def test_collect_bugs_multiple_unrelease_manual_upload(self):
         """Only collect bugs until the last manual upload."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'multiple_unrelease_with_release')
+        path = join(self.changelogs_dir, 'multiple_unrelease_with_release')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(
                 self.package.collect_package_bugs(), set(['23456']))
 
     def test_collect_bugs_only_one_unreleased_changelog(self):
         """Collect the bugs from the one unreleased changelog."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'one_unreleased')
+        path = join(self.changelogs_dir, 'one_unreleased')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(
                 self.package.collect_package_bugs(), set(['12345']))
 
     def test_collect_bugs_only_one_unreleased_changelog_no_bug(self):
         """We have no bug from the only one unreleased changelog."""
-        path = os_path_join_safe(
-            self.changelogs_file_dir, 'one_unreleased_no_bug')
+        path = join(self.changelogs_dir, 'one_unreleased_no_bug')
         self.package.name = 'foo'
-        with patch('cupstream2distro.packagemanager.os_path_join_safe',
+        with patch('cupstream2distro.packagemanager.join',
                    lambda *ignore: path):
             self.assertEqual(self.package.collect_package_bugs(), set())
 
@@ -449,18 +442,16 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '1.2daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'simple_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'simple_changelog_update')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_nochange(self):
         """Correctly indicate a no-change rebuild."""
         changelog = self.prep_debian_file('changelog', s.DUMMY_CHANGELOG)
         self.package.series.name = 'raring'
         self.package.update_package_changelog('1.2daily83.09.14-0ubuntu1', {})
-        result_file = os_path_join_safe(
-            self.result_dir, 'simple_changelog_nochange')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'simple_changelog_nochange')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_unicode(self):
         """Update a changelog from one author with a bug and bzr rev."""
@@ -469,9 +460,8 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '1.2daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'unicode_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'unicode_changelog_update')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_one_author_multiple_bugs(self):
         """Update a changelog from a list of one author with multiple bugs."""
@@ -482,9 +472,9 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '1.2daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
+        res = join(
             self.result_dir, 'multiple_bugs_one_author_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_multiple_authors(self):
         """Update a changelog from multiple authors with multiple bugs."""
@@ -497,9 +487,8 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '1.2daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'multiple_authors_bugs_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'multiple_authors_bugs_changelog_update')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_with_msg_starting_with_dash(self):
         """Update a changelog with a message starting with '-'."""
@@ -508,9 +497,8 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '42.0daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'message_starting_with_dash')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'message_starting_with_dash')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_with_existing_content(self):
         """Update a changelog when we already have existing content."""
@@ -523,9 +511,8 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '42.0daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'existing_content_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'existing_content_changelog_update')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_with_existing_content_existing_author(self):
         """Update a changelog when we already have existing author."""
@@ -539,9 +526,8 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '42.0daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
-            self.result_dir, 'existing_content_author_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        res = join(self.result_dir, 'existing_content_author_changelog_update')
+        self.assert_changelogs_identical(res, changelog)
 
     def test_update_changelog_with_existing_content_existing_multiple_authors(
             self):
@@ -555,10 +541,10 @@
         self.package.series.name = 'raring'
         self.package.update_package_changelog(
             '42.0daily83.09.14-0ubuntu1', authors)
-        result_file = os_path_join_safe(
+        res = join(
             self.result_dir,
             'existing_content_multiple_authors_changelog_update')
-        self.assert_changelogs_identical(result_file, changelog)
+        self.assert_changelogs_identical(res, changelog)
 
     @patch('cupstream2distro.packagemanager.log_call')
     def test_update_changelog_failure(self, lc_mock):
@@ -586,10 +572,8 @@
         changelog = self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         symbols = self.prep_debian_file('foo.symbols', s.BASIC_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
-            self.result_dir, 'simple_update.symbols')
-        result_changelog = os_path_join_safe(
-            self.result_dir, 'simple_foo_update.changelog')
+        result_symbols = join(self.result_dir, 'simple_update.symbols')
+        result_changelog = join(self.result_dir, 'simple_foo_update.changelog')
         self.assert_files_identical(symbols, result_symbols)
         self.assert_changelogs_identical(result_changelog, changelog)
 
@@ -598,10 +582,9 @@
         changelog = self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         symbols = self.prep_debian_file('foo.symbols', s.MULTIPLE_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
+        result_symbols = join(
             self.result_dir, 'multiplesymbols_update.symbols')
-        result_changelog = os_path_join_safe(
-            self.result_dir, 'simple_foo_update.changelog')
+        result_changelog = join(self.result_dir, 'simple_foo_update.changelog')
         self.assert_files_identical(symbols, result_symbols)
         self.assert_changelogs_identical(result_changelog, changelog)
 
@@ -611,9 +594,8 @@
             'changelog', s.BASIC_SYMBOLS_WITH_CHANGELOG)
         symbols = self.prep_debian_file('foo.symbols', s.BASIC_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
-            self.result_dir, 'simple_update.symbols')
-        result_changelog = os_path_join_safe(
+        result_symbols = join(self.result_dir, 'simple_update.symbols')
+        result_changelog = join(
             self.result_dir,
             'simple_foo_update_with_existing_content.changelog')
         self.assert_files_identical(symbols, result_symbols)
@@ -642,10 +624,9 @@
         foos = self.prep_debian_file('foo.symbols', s.MULTIPLE_SYMBOLS)
         bars = self.prep_debian_file('bar.symbols', s.MULTIPLE_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
+        result_symbols = join(
             self.result_dir, 'multiplesymbols_update.symbols')
-        result_changelog = os_path_join_safe(
-            self.result_dir, 'multiple_update.changelog')
+        result_changelog = join(self.result_dir, 'multiple_update.changelog')
         self.assert_files_identical(foos, result_symbols)
         self.assert_files_identical(bars, result_symbols)
         self.assert_changelogs_identical(result_changelog, changelog)
@@ -655,10 +636,8 @@
         changelog = self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         symbols = self.prep_debian_file('symbols', s.BASIC_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
-            self.result_dir, 'simple_update.symbols')
-        result_changelog = os_path_join_safe(
-            self.result_dir, 'simple_update.changelog')
+        result_symbols = join(self.result_dir, 'simple_update.symbols')
+        result_changelog = join(self.result_dir, 'simple_update.changelog')
         self.assert_files_identical(symbols, result_symbols)
         self.assert_changelogs_identical(result_changelog, changelog)
 
@@ -667,9 +646,8 @@
         changelog = self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         symbols = self.prep_debian_file('foo.symbols.amd64', s.BASIC_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
-            self.result_dir, 'simple_update.symbols')
-        result_changelog = os_path_join_safe(
+        result_symbols = join(self.result_dir, 'simple_update.symbols')
+        result_changelog = join(
             self.result_dir, 'simple_update_arch.changelog')
         self.assert_changelogs_identical(result_changelog, changelog)
         self.assert_files_identical(symbols, result_symbols)
@@ -679,9 +657,8 @@
         changelog = self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         symbols = self.prep_debian_file('symbols.amd64', s.BASIC_SYMBOLS)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
-        result_symbols = os_path_join_safe(
-            self.result_dir, 'simple_update.symbols')
-        result_changelog = os_path_join_safe(
+        result_symbols = join(self.result_dir, 'simple_update.symbols')
+        result_changelog = join(
             self.result_dir, 'simple_update_alone_arch.changelog')
         self.assert_files_identical(symbols, result_symbols)
         self.assert_changelogs_identical(result_changelog, changelog)
@@ -689,8 +666,7 @@
     def test_dont_refresh_symbols_files_for_directory(self):
         """We don't fail for directories under debian/."""
         self.prep_debian_file('changelog', s.DUMMY_CHANGELOG)
-        debian_source_path = os_path_join_safe(
-            self.tempdir, 'debian', 'source')
+        debian_source_path = join(self.tempdir, 'debian', 'source')
         os.mkdir(debian_source_path)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
         self.assertTrue(os.path.isdir(debian_source_path))
@@ -699,8 +675,7 @@
         """We don't touch symlinks under debian/."""
         self.prep_debian_file('changelog', s.BASE_CHANGELOG)
         self.prep_debian_file('foo.symbols', s.BASIC_SYMBOLS)
-        symlink_path = os_path_join_safe(
-            self.tempdir, 'debian', 'foo.symbols.link')
+        symlink_path = join(self.tempdir, 'debian', 'foo.symbols.link')
         os.symlink('foo.symbols', symlink_path)
         self.package.refresh_package_versions('42.0daily83.09.14-0ubuntu1')
         self.assertTrue(os.path.islink(symlink_path))

=== modified file 'tests/unit/test_project.py'
--- tests/unit/test_project.py	2015-08-22 03:33:11 +0000
+++ tests/unit/test_project.py	2015-09-10 02:16:41 +0000
@@ -18,9 +18,10 @@
 
 from tests.unit import DirectoryAwareTestCase
 
+from os.path import join
 from cupstream2distro import project
 from cupstream2distro.project import DotProject
-from cupstream2distro.utils import env, os_path_join_safe, utf8_open
+from cupstream2distro.utils import env, utf8_open
 
 import os
 import shutil
@@ -31,7 +32,7 @@
     def setUp(self):
         """Mock out SILO_DIR and SILOS_DIR for testing."""
         super().setUp()
-        project.SILO_DIR = lambda: self.tempdir
+        project.SILO_DIR = lambda *parts: join(self.tempdir, *parts)
         env.SILONAME = ''
 
     def test_file_creation(self):
@@ -39,8 +40,8 @@
         proj = DotProject('hello')
         proj.write()
         self.assertTrue(os.path.isfile(
-            os_path_join_safe(self.tempdir, 'hello.project')))
-        path = os_path_join_safe(self.tempdir, 'hello.project')
+            join(self.tempdir, 'hello.project')))
+        path = join(self.tempdir, 'hello.project')
         with utf8_open(path) as data:
             self.assertEqual(data.readlines(), [])
 
@@ -50,7 +51,7 @@
         proj.dest_current_version = '0.99.alpha+15.04.20141225-0ubuntu1'
         proj.packaging_version = '1.0+15.04.20150101-0ubuntu1'
         proj.write()
-        path = os_path_join_safe(self.tempdir, 'yeehaw.project')
+        path = join(self.tempdir, 'yeehaw.project')
         with utf8_open(path) as data:
             self.assertEqual(data.readlines(), [
                 '[Package]\n',
@@ -63,7 +64,7 @@
         """Does the soft_save method create the expected values in the file?"""
         DotProject.soft_save(
             'yessir', dest='0.1', ours='0.2')
-        path = os_path_join_safe(self.tempdir, 'yessir.project')
+        path = join(self.tempdir, 'yessir.project')
         with utf8_open(path) as data:
             self.assertEqual(data.readlines(), [
                 '[Package]\n',
@@ -75,7 +76,7 @@
     def test_soft_save_initial_with_blanks(self):
         """Does soft_save create the expected blank values in the file?"""
         DotProject.soft_save('yessir', dest='', ours='0.2')
-        path = os_path_join_safe(self.tempdir, 'yessir.project')
+        path = join(self.tempdir, 'yessir.project')
         with utf8_open(path) as data:
             self.assertEqual(data.readlines(), [
                 '[Package]\n',
@@ -88,7 +89,7 @@
         """Does a second call to soft_save preserve original values?"""
         DotProject.soft_save('yessir', dest='0.1', ours='0.2')
         DotProject.soft_save('yessir', ours='0.3')
-        path = os_path_join_safe(self.tempdir, 'yessir.project')
+        path = join(self.tempdir, 'yessir.project')
         with utf8_open(path) as data:
             self.assertEqual(data.readlines(), [
                 '[Package]\n',
@@ -99,7 +100,7 @@
 
     def test_file_reading(self):
         """If we create a file manually, can DotProject read those values?"""
-        path = os_path_join_safe(self.tempdir, 'fuddy.project')
+        path = join(self.tempdir, 'fuddy.project')
         with utf8_open(path, 'w') as data:
             data.write(
                 '[Package]\n'
@@ -114,7 +115,7 @@
     def test_get_previous_distro_version_from_config(self):
         """Can we access dest_current_version?"""
         shutil.copy2(
-            os_path_join_safe(self.project_file_dir, 'foo.project'),
+            join(self.project_file_dir, 'foo.project'),
             self.tempdir)
         self.assertEqual(
             DotProject('foo').dest_current_version,
@@ -123,7 +124,7 @@
     def test_get_all_packages_uploaded(self):
         """Does get_all_packages_uploaded find one file?"""
         shutil.copy2(
-            os_path_join_safe(self.project_file_dir, 'foo.project'),
+            join(self.project_file_dir, 'foo.project'),
             self.tempdir)
         self.assertEqual(
             DotProject.get_all_packages_uploaded(),
@@ -132,9 +133,9 @@
     def test_get_all_packages_uploaded_multi(self):
         """Does get_all_packages_uploaded find three files?"""
         shutil.copy2(
-            os_path_join_safe(self.project_file_dir, 'foo.project'),
+            join(self.project_file_dir, 'foo.project'),
             self.tempdir)
-        path = os_path_join_safe(self.tempdir, 'f.project')
+        path = join(self.tempdir, 'f.project')
         with utf8_open(path, 'w') as data:
             data.write(
                 '[Package]\n'
@@ -155,10 +156,10 @@
 
     def test_mark_project_as_published(self):
         """Confirm project file creation to avoid re-publishing projects."""
-        shutil.copy2(os_path_join_safe(self.project_file_dir, 'foo.project'),
+        shutil.copy2(join(self.project_file_dir, 'foo.project'),
                      self.tempdir)
         DotProject('foo').mark_as_published('4.2dailysomething-0ubuntu1')
-        filename = os_path_join_safe(self.tempdir, 'foo.project')
+        filename = join(self.tempdir, 'foo.project')
         self.assertTrue(os.path.isfile(filename))
         with utf8_open(filename) as data:
             self.assertEqual(data.readlines(), [
@@ -171,10 +172,10 @@
 
     def test_mark_project_and_diff_as_published(self):
         """Confirm diff file creation to prevent project republishing."""
-        shutil.copy2(os_path_join_safe(self.project_file_dir, 'foo.project'),
+        shutil.copy2(join(self.project_file_dir, 'foo.project'),
                      self.tempdir)
-        shutil.copy2(os_path_join_safe(self.project_file_dir, 'foo.project'),
-                     os_path_join_safe(
+        shutil.copy2(join(self.project_file_dir, 'foo.project'),
+                     join(
                          self.tempdir, 'packaging_changes_foo_4.2'
                          'dailysomething-0ubuntu1.diff'))
         DotProject('foo').mark_as_published('4.2dailysomething-0ubuntu1')

=== modified file 'tests/unit/test_recipe_base.py'
--- tests/unit/test_recipe_base.py	2015-09-09 00:14:07 +0000
+++ tests/unit/test_recipe_base.py	2015-09-10 02:16:41 +0000
@@ -16,6 +16,7 @@
 
 """Tests for CI Train Build script."""
 
+from os.path import join
 from pprint import pprint
 from mock import Mock, call, patch
 
@@ -27,7 +28,7 @@
     DEPWAIT_TIMEOUT as DW,
     PPA_TIMEOUT as PT,
 )
-from cupstream2distro.utils import env, os_path_join_safe
+from cupstream2distro.utils import env
 from cupstream2distro.errors import (
     BuildError,
     CITrainError,
@@ -378,7 +379,7 @@
         with patch('cupstream2distro.utils.SILOS_DIR', self.tempdir):
             build.diff_phase()
         build.get_from_archive.assert_called_once_with(
-            os_path_join_safe(self.tempdir, 'ubuntu', 'bar'),
+            join(self.tempdir, 'ubuntu', 'bar'),
             archive=build.dest,
             status='Published')
         build.generate_package_diffs.assert_called_once_with(
@@ -399,7 +400,7 @@
         with patch('cupstream2distro.utils.SILOS_DIR', self.tempdir):
             build.diff_phase()
         build.get_from_archive.assert_called_once_with(
-            os_path_join_safe(self.tempdir, 'ubuntu', 'bar'),
+            join(self.tempdir, 'ubuntu', 'bar'),
             archive=build.dest,
             status='Published')
         build.generate_package_diffs.assert_called_once_with(None, 'new_dsc')
@@ -420,7 +421,7 @@
         with patch('cupstream2distro.utils.SILOS_DIR', self.tempdir):
             build.diff_phase()
         build.get_from_archive.assert_called_once_with(
-            os_path_join_safe(self.tempdir, 'ubuntu', 'bar'),
+            join(self.tempdir, 'ubuntu', 'bar'),
             archive=build.main_archive,
             status='Published')
         build.generate_package_diffs.assert_called_once_with(None, 'new_dsc')

=== modified file 'tests/unit/test_recipe_secondary.py'
--- tests/unit/test_recipe_secondary.py	2015-08-21 06:28:34 +0000
+++ tests/unit/test_recipe_secondary.py	2015-09-10 02:16:41 +0000
@@ -16,12 +16,13 @@
 
 """Tests for CI Train Secondary Recipe."""
 
+from os.path import join
 from mock import Mock, patch
 
 from tests.unit import DirectoryAwareTestCase
 
 from citrain.recipes.secondary import Secondary
-from cupstream2distro.utils import env, os_path_join_safe
+from cupstream2distro.utils import env
 
 
 MOD = 'citrain.recipes.secondary.'
@@ -52,7 +53,7 @@
         lp_mock.load.assert_called_once_with(
             self.series.previous_series_link)
         self.assertEqual(
-            sec.path, os_path_join_safe(self.tempdir, 'foo_+vivid'))
+            sec.path, join(self.tempdir, 'foo_+vivid'))
         sec.clean_phase()
         sec.upload_phase()
         sec.diff_phase()
@@ -79,8 +80,8 @@
         sec.get_package_version.return_value = '0+15.10.20150525-0ubuntu1'
         sec.collect_phase()
         sh_mock.copytree.assert_called_once_with(
-            os_path_join_safe(self.tempdir, 'foo'),
-            os_path_join_safe(self.tempdir, 'foo_+vivid'),
+            join(self.tempdir, 'foo'),
+            join(self.tempdir, 'foo_+vivid'),
             symlinks=True)
         sec.correct_package_changelog.assert_called_once_with(
             '0+15.04.20150525-0ubuntu1', 'vivid')

=== modified file 'tests/unit/test_revno.py'
--- tests/unit/test_revno.py	2015-08-30 08:24:36 +0000
+++ tests/unit/test_revno.py	2015-09-10 02:16:41 +0000
@@ -16,10 +16,12 @@
 
 """Tests for .revno file logic."""
 
+from os.path import join
+
 from tests.unit import BaseTestCase
 
 from cupstream2distro import revno
-from cupstream2distro.utils import os_path_join_safe, utf8_open
+from cupstream2distro.utils import utf8_open
 from cupstream2distro.errors import PublishError
 
 
@@ -29,7 +31,7 @@
     def setUp(self):
         """Set SILO_DIR to tempdir so we can create files safely."""
         super().setUp()
-        revno.SILO_DIR = lambda *p: os_path_join_safe(self.tempdir, *p)
+        revno.SILO_DIR = lambda *parts: join(self.tempdir, *parts)
 
     def test_init(self):
         """Class can be instantiated with expected values."""

=== modified file 'tests/unit/test_script_migration.py'
--- tests/unit/test_script_migration.py	2015-09-09 22:10:41 +0000
+++ tests/unit/test_script_migration.py	2015-09-10 02:16:41 +0000
@@ -16,12 +16,12 @@
 
 """Tests for CI Train Migration script."""
 
+from os.path import join
 from mock import Mock, call
 
 from tests.unit import CITrainScriptTestCase
 
 from cupstream2distro.settings import SILOS_DIR
-from cupstream2distro.utils import os_path_join_safe
 from cupstream2distro.errors import MigrationError
 
 # Unused import necessary for code coverage reporting
@@ -38,7 +38,7 @@
         self.script.MergeManager = Mock()
         self.script.merge_main = Mock()
         self.script.glob.return_value = [
-            os_path_join_safe(SILOS_DIR, 'ubuntu', 'landing-00{}'.format(x))
+            join(SILOS_DIR, 'ubuntu', 'landing-00{}'.format(x))
             for x in range(3)]
 
     def test_main(self):

=== modified file 'tests/unit/test_script_prepare_silo.py'
--- tests/unit/test_script_prepare_silo.py	2015-09-09 00:14:07 +0000
+++ tests/unit/test_script_prepare_silo.py	2015-09-10 02:16:41 +0000
@@ -16,12 +16,12 @@
 
 """Tests for CI Train Prepare script."""
 
-from os.path import expanduser
+from os.path import expanduser, join
 from mock import Mock, call
 from os import environ
 
 from cupstream2distro import project
-from cupstream2distro.utils import env, os_path_join_safe
+from cupstream2distro.utils import env
 from cupstream2distro.errors import PrepError
 
 from tests.unit import CITrainScriptTestCase
@@ -51,7 +51,7 @@
         self.script.glob.return_value = ['a', 'b', 'c']
         self.clean_source('friggle')
         self.assertEqual(self.script.shutil.rmtree.mock_calls, [
-            call(os_path_join_safe(self.tempdir, 'friggle')),
+            call(join(self.tempdir, 'friggle')),
         ])
         self.assertEqual(
             self.script.os.remove.mock_calls, [
@@ -65,7 +65,7 @@
         self.script.os.remove.side_effect = OSError('Is a directory')
         self.clean_source('friggle')
         self.assertEqual(self.script.shutil.rmtree.mock_calls, [
-            call(os_path_join_safe(self.tempdir, 'friggle')),
+            call(join(self.tempdir, 'friggle')),
             call('a'), call('b'), call('c'),
         ])
         self.assertEqual(

=== modified file 'tests/unit/test_script_setup_citrain.py'
--- tests/unit/test_script_setup_citrain.py	2015-09-05 01:42:54 +0000
+++ tests/unit/test_script_setup_citrain.py	2015-09-10 02:16:41 +0000
@@ -20,12 +20,13 @@
 import glob
 import json
 
+from os.path import join
 from mock import Mock, call
 from collections import defaultdict
 
 from tests.unit import CITrainScriptTestCase
 
-from cupstream2distro.utils import os_path_join_safe, utf8_open
+from cupstream2distro.utils import utf8_open
 from cupstream2distro.settings import PPA_TEAM, read_silo_names
 
 # Unused import necessary for code coverage reporting
@@ -39,7 +40,7 @@
 
     def test_read_silo_names(self):
         """Ensure that we can read the silo name list from disk."""
-        listfile = os_path_join_safe(self.tempdir, 'list')
+        listfile = join(self.tempdir, 'list')
         expected = ['ubuntu/one', 'ubuntu/two']
         with utf8_open(listfile, 'w') as data:
             data.write(json.dumps(expected))
@@ -89,7 +90,7 @@
         self.script.JOBS_DIR = self.tempdir
         self.script.os.makedirs = os.makedirs
         self.script.setup_job('prepare-silo')
-        config = os_path_join_safe(self.tempdir, 'prepare-silo', 'config.xml')
+        config = join(self.tempdir, 'prepare-silo', 'config.xml')
         with utf8_open(config) as data:
             self.assertEqual(data.read(), 'hello there!')
         self.script.load_template.assert_called_once_with(
@@ -168,7 +169,7 @@
         self.script.JOBS_DIR = self.tempdir
         self.script.os.makedirs = os.makedirs
         self.assertEqual(self.script.main(), 0)
-        result = sorted(glob.glob(os_path_join_safe(self.tempdir, '*', '*')))
+        result = sorted(glob.glob(join(self.tempdir, '*', '*')))
         self.assertEqual(len(result), len(expected))
         for expectation in expected:
-            self.assertIn(os_path_join_safe(self.tempdir, expectation), result)
+            self.assertIn(join(self.tempdir, expectation), result)

=== modified file 'tests/unit/test_utils.py'
--- tests/unit/test_utils.py	2015-09-09 00:14:07 +0000
+++ tests/unit/test_utils.py	2015-09-10 02:16:41 +0000
@@ -18,7 +18,7 @@
 
 import os
 
-from six.moves import range as gen_range
+from os.path import join
 from mock import Mock, patch
 
 from cupstream2distro.utils import (
@@ -28,7 +28,6 @@
     find_all_uploaded,
     log_call,
     name_ppa,
-    os_path_join_safe,
     run_script,
     singleton,
     utf8_inplace,
@@ -120,31 +119,6 @@
             env.TESTING = orig
             self.assertEqual(env.TESTING, result)
 
-    def test_os_path_join_safe(self):
-        """Our os_path_join_safe gives identical results as os.path.join()."""
-        home = os.path.expanduser('~')
-        cases = (
-            ('',),
-            (home,),
-            (home, 'foo'),
-            [home] + list('abc'),
-            [os.sep] + [str(i) for i in gen_range(10)],
-        )
-        for case in cases:
-            self.assertEqual(os_path_join_safe(*case), os.path.join(*case))
-
-    def test_os_path_join_safe_exception(self):
-        """But raise an exception when there are too many abs paths."""
-        home = os.path.expanduser('~')
-        cases = (
-            (home, home),
-            (home, os.sep),
-            (home, 'foo', home),
-        )
-        for case in cases:
-            with self.assertRaises(AssertionError):
-                os_path_join_safe(*case)
-
     def test_silo_dir(self):
         """SILO_DIR() function can find the correct silo dir dynamically."""
         env.SILONAME = ''
@@ -251,7 +225,7 @@
 
     def test_utf8_inplace_permissions(self):
         """Ensure utf8_inplace preserves a file's permissions."""
-        path = os_path_join_safe(self.tempdir, 'test.sh')
+        path = join(self.tempdir, 'test.sh')
         with utf8_open(path, 'w') as data:
             data.write('#!/bin/sh')
         os.chmod(path, 0o755)