Use os.path directly rather than sometimes importing it separately.

(imported from commit 48486c4ea64d02a15faeebb0f490d31e9b113d62)
This commit is contained in:
Tim Abbott 2013-10-28 10:54:32 -04:00
parent 491d21302c
commit 6894453ab5
14 changed files with 38 additions and 40 deletions

View file

@ -6,9 +6,9 @@ import optparse
import urlparse
import itertools
import traceback
from os import path
import os
sys.path.append(path.join(path.dirname(__file__), '../api'))
sys.path.append(os.path.join(os.path.dirname(__file__), '../api'))
import zulip
parser = optparse.OptionParser(r"""
@ -57,7 +57,7 @@ except ImportError:
def get_calendar_url():
parts = urlparse.urlparse(options.calendar)
pat = path.split(parts.path)
pat = os.path.split(parts.path)
if pat[1] != 'basic':
parser.error('The --calendar URL should be the XML "Private Address" ' +
'from your calendar settings')