diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-23 18:14:08 +0100 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-09-24 11:24:36 +0000 |
| commit | a751e4fc1ab7b00ae70f12f498d2050a5fb71445 (patch) | |
| tree | 94bd038495f06a46ade459f72face80bf5ff7392 /morphlib/sysbranchdir.py | |
| parent | f9c02205608356b4c57611509b574e3874d243a9 (diff) | |
| download | morph-a751e4fc1ab7b00ae70f12f498d2050a5fb71445.tar.gz | |
Allow Morph code to be run with Python 2.7 and Python 3.4sam/python3
PRETTY BROKEN!
Change-Id: I92545c821103eea1316383086e77e6b654f2321c
Diffstat (limited to 'morphlib/sysbranchdir.py')
| -rw-r--r-- | morphlib/sysbranchdir.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/morphlib/sysbranchdir.py b/morphlib/sysbranchdir.py index d23d9eea..83a86c5c 100644 --- a/morphlib/sysbranchdir.py +++ b/morphlib/sysbranchdir.py @@ -16,12 +16,18 @@ import cliapp + import os -import urlparse +import sys import uuid import morphlib +if sys.version_info[0] == 2: # pragma: no cover + import urlparse +else: # pragma: no cover + import urllib.parse as urlparse + class SystemBranchDirectoryAlreadyExists(morphlib.Error): |