averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various Python cleanups

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/SourceKit/bindings/python/sourcekitd/capi.py
View File

@@ -156,7 +156,7 @@ class ErrorKind(object):
if value >= len(ErrorKind._kinds): if value >= len(ErrorKind._kinds):
ErrorKind._kinds += [None] * (value - len(ErrorKind._kinds) + 1) ErrorKind._kinds += [None] * (value - len(ErrorKind._kinds) + 1)
if ErrorKind._kinds[value] is not None: if ErrorKind._kinds[value] is not None:
raise ValueError,'ErrorKind already loaded' raise ValueError('ErrorKind already loaded')
self.value = value self.value = value
ErrorKind._kinds[value] = self ErrorKind._kinds[value] = self
ErrorKind._name_map = None ErrorKind._name_map = None
@@ -177,7 +177,7 @@ class ErrorKind(object):
@staticmethod @staticmethod
def from_id(id): def from_id(id):
if id >= len(ErrorKind._kinds) or ErrorKind._kinds[id] is None: 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] return ErrorKind._kinds[id]
def __repr__(self): def __repr__(self):
@@ -239,7 +239,7 @@ class VariantType(object):
if value >= len(VariantType._kinds): if value >= len(VariantType._kinds):
VariantType._kinds += [None] * (value - len(VariantType._kinds) + 1) VariantType._kinds += [None] * (value - len(VariantType._kinds) + 1)
if VariantType._kinds[value] is not None: if VariantType._kinds[value] is not None:
raise ValueError,'VariantType already loaded' raise ValueError('VariantType already loaded')
self.value = value self.value = value
VariantType._kinds[value] = self VariantType._kinds[value] = self
VariantType._name_map = None VariantType._name_map = None
@@ -260,7 +260,7 @@ class VariantType(object):
@staticmethod @staticmethod
def from_id(id): def from_id(id):
if id >= len(VariantType._kinds) or VariantType._kinds[id] is None: 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] return VariantType._kinds[id]
def __repr__(self): def __repr__(self):
@@ -540,7 +540,7 @@ class Config:
def set_library_path(path): def set_library_path(path):
"""Set the path in which to search for sourcekitd""" """Set the path in which to search for sourcekitd"""
if Config.loaded: 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.") "any other functionalities in sourcekitd.")
Config.library_path = path Config.library_path = path
@@ -549,7 +549,7 @@ class Config:
def set_library_file(filename): def set_library_file(filename):
"""Set the exact location of sourcekitd""" """Set the exact location of sourcekitd"""
if Config.loaded: 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.") "any other functionalities in sourcekitd.")
Config.library_file = filename Config.library_file = filename

2
utils/cmpcodesize/cmpcodesize/compare.py
View File

@@ -50,7 +50,7 @@ def addFunction(sizes, function, startAddr, endAddr, groupByPrefix):
if groupByPrefix: if groupByPrefix:
for infix in SortedInfixes: for infix in SortedInfixes:
if infix in function: if infix in function:
if not GenericFunctionPrefix in function: if GenericFunctionPrefix not in function:
sizes[Infixes[infix]] += size sizes[Infixes[infix]] += size
return return
for prefix in SortedPrefixes: for prefix in SortedPrefixes:

3
utils/pass-pipeline/scripts/pipeline_generator.py
View File

@@ -3,7 +3,6 @@
import os import os
import sys import sys
import argparse import argparse
import itertools
import json import json
import textwrap import textwrap
@@ -31,7 +30,7 @@ disabled_passes = sum(args.disable_pass, [])
disabled_passpipelines = sum(args.disable_passpipeline, []) disabled_passpipelines = sum(args.disable_passpipeline, [])
# First filter out pipelines. # First filter out pipelines.
normal_pipeline_generated = [x.generate() for x in normal_pipeline if not x.identifier in disabled_passpipelines] normal_pipeline_generated = [x.generate() for x in normal_pipeline if x.identifier not in disabled_passpipelines]
# Then filter out specific passes. # Then filter out specific passes.
for i in range(len(normal_pipeline_generated)): for i in range(len(normal_pipeline_generated)):

1
utils/pass-pipeline/scripts/pipelines_build_script.py
View File

@@ -9,7 +9,6 @@ import textwrap
# Append the src dir # Append the src dir
sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'src')) sys.path.append(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'src'))
import pass_pipeline_library
import passes import passes
# TODO: This should not be hard coded. # TODO: This should not be hard coded.

5
utils/pass-pipeline/src/pass_pipeline.py
View File

@@ -1,8 +1,3 @@
import sys
import json
import itertools
class Pass(object): class Pass(object):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name