Various Python cleanups

Fixes:
* Unused import
* Redundant backslash
* Use of discouraged if not x in y
* Use of deprecated form of raising exceptions

Follow-up to PR #655 as requested by @gribozavr
This commit is contained in:
practicalswift
2015-12-22 21:05:47 +01:00
parent 37b827c8c5
commit 4f2496e1a6
5 changed files with 8 additions and 15 deletions

View File

@@ -156,7 +156,7 @@ class ErrorKind(object):
if value >= len(ErrorKind._kinds):
ErrorKind._kinds += [None] * (value - len(ErrorKind._kinds) + 1)
if ErrorKind._kinds[value] is not None:
raise ValueError,'ErrorKind already loaded'
raise ValueError('ErrorKind already loaded')
self.value = value
ErrorKind._kinds[value] = self
ErrorKind._name_map = None
@@ -177,7 +177,7 @@ class ErrorKind(object):
@staticmethod
def from_id(id):
if id >= len(ErrorKind._kinds) or ErrorKind._kinds[id] is None:
raise ValueError,'Unknown type kind %d' % id
raise ValueError('Unknown type kind {}'.format(id))
return ErrorKind._kinds[id]
def __repr__(self):
@@ -239,7 +239,7 @@ class VariantType(object):
if value >= len(VariantType._kinds):
VariantType._kinds += [None] * (value - len(VariantType._kinds) + 1)
if VariantType._kinds[value] is not None:
raise ValueError,'VariantType already loaded'
raise ValueError('VariantType already loaded')
self.value = value
VariantType._kinds[value] = self
VariantType._name_map = None
@@ -260,7 +260,7 @@ class VariantType(object):
@staticmethod
def from_id(id):
if id >= len(VariantType._kinds) or VariantType._kinds[id] is None:
raise ValueError,'Unknown type kind %d' % id
raise ValueError('Unknown type kind {}'.format(id))
return VariantType._kinds[id]
def __repr__(self):
@@ -540,7 +540,7 @@ class Config:
def set_library_path(path):
"""Set the path in which to search for sourcekitd"""
if Config.loaded:
raise Exception("library path must be set before before using " \
raise Exception("library path must be set before before using "
"any other functionalities in sourcekitd.")
Config.library_path = path
@@ -549,7 +549,7 @@ class Config:
def set_library_file(filename):
"""Set the exact location of sourcekitd"""
if Config.loaded:
raise Exception("library file must be set before before using " \
raise Exception("library file must be set before before using "
"any other functionalities in sourcekitd.")
Config.library_file = filename