From: Robert Bradshaw Date: Mon, 13 Dec 2010 20:34:49 +0000 (-0800) Subject: Couple more trailing whitespace deletions. X-Git-Tag: 0.14~3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c6c1340373d0a307c12de23567d4923010816072;p=cython.git Couple more trailing whitespace deletions. --- diff --git a/Cython/Includes/Deprecated/stl.pxd b/Cython/Includes/Deprecated/stl.pxd index 1b298352..22248d26 100644 --- a/Cython/Includes/Deprecated/stl.pxd +++ b/Cython/Includes/Deprecated/stl.pxd @@ -1,91 +1,91 @@ -cdef extern from "" namespace std: - - cdef cppclass vector[TYPE]: - #constructors - __init__() - __init__(vector&) - __init__(int) - __init__(int, TYPE&) - __init__(iterator, iterator) - #operators - TYPE& __getitem__(int) - TYPE& __setitem__(int, TYPE&) - vector __new__(vector&) - bool __eq__(vector&, vector&) - bool __ne__(vector&, vector&) - bool __lt__(vector&, vector&) - bool __gt__(vector&, vector&) - bool __le__(vector&, vector&) - bool __ge__(vector&, vector&) - #others - void assign(int, TYPE) - #void assign(iterator, iterator) - TYPE& at(int) - TYPE& back() - iterator begin() - int capacity() - void clear() - bool empty() - iterator end() - iterator erase(iterator) - iterator erase(iterator, iterator) - TYPE& front() - iterator insert(iterator, TYPE&) - void insert(iterator, int, TYPE&) - void insert(iterator, iterator) - int max_size() - void pop_back() - void push_back(TYPE&) - iterator rbegin() - iterator rend() - void reserve(int) - void resize(int) - void resize(int, TYPE&) #void resize(size_type num, const TYPE& = TYPE()) - int size() - void swap(container&) - -cdef extern from "" namespace std: - - cdef cppclass deque[TYPE]: - #constructors - __init__() - __init__(deque&) - __init__(int) - __init__(int, TYPE&) - __init__(iterator, iterator) - #operators - TYPE& operator[]( size_type index ); - const TYPE& operator[]( size_type index ) const; - deque __new__(deque&); - bool __eq__(deque&, deque&); - bool __ne__(deque&, deque&); - bool __lt__(deque&, deque&); - bool __gt__(deque&, deque&); - bool __le__(deque&, deque&); - bool __ge__(deque&, deque&); - #others - void assign(int, TYPE&) - void assign(iterator, iterator) - TYPE& at(int) - TYPE& back() - iterator begin() - void clear() - bool empty() - iterator end() - iterator erase(iterator) - iterator erase(iterator, iterator) - TYPE& front() - iterator insert(iterator, TYPE&) - void insert(iterator, int, TYPE&) - void insert(iterator, iterator, iterator) - int max_size() - void pop_back() - void pop_front() - void push_back(TYPE&) - void push_front(TYPE&) - iterator rbegin() - iterator rend() - void resize(int) - void resize(int, TYPE&) - int size() - void swap(container&) +cdef extern from "" namespace std: + + cdef cppclass vector[TYPE]: + #constructors + __init__() + __init__(vector&) + __init__(int) + __init__(int, TYPE&) + __init__(iterator, iterator) + #operators + TYPE& __getitem__(int) + TYPE& __setitem__(int, TYPE&) + vector __new__(vector&) + bool __eq__(vector&, vector&) + bool __ne__(vector&, vector&) + bool __lt__(vector&, vector&) + bool __gt__(vector&, vector&) + bool __le__(vector&, vector&) + bool __ge__(vector&, vector&) + #others + void assign(int, TYPE) + #void assign(iterator, iterator) + TYPE& at(int) + TYPE& back() + iterator begin() + int capacity() + void clear() + bool empty() + iterator end() + iterator erase(iterator) + iterator erase(iterator, iterator) + TYPE& front() + iterator insert(iterator, TYPE&) + void insert(iterator, int, TYPE&) + void insert(iterator, iterator) + int max_size() + void pop_back() + void push_back(TYPE&) + iterator rbegin() + iterator rend() + void reserve(int) + void resize(int) + void resize(int, TYPE&) #void resize(size_type num, const TYPE& = TYPE()) + int size() + void swap(container&) + +cdef extern from "" namespace std: + + cdef cppclass deque[TYPE]: + #constructors + __init__() + __init__(deque&) + __init__(int) + __init__(int, TYPE&) + __init__(iterator, iterator) + #operators + TYPE& operator[]( size_type index ); + const TYPE& operator[]( size_type index ) const; + deque __new__(deque&); + bool __eq__(deque&, deque&); + bool __ne__(deque&, deque&); + bool __lt__(deque&, deque&); + bool __gt__(deque&, deque&); + bool __le__(deque&, deque&); + bool __ge__(deque&, deque&); + #others + void assign(int, TYPE&) + void assign(iterator, iterator) + TYPE& at(int) + TYPE& back() + iterator begin() + void clear() + bool empty() + iterator end() + iterator erase(iterator) + iterator erase(iterator, iterator) + TYPE& front() + iterator insert(iterator, TYPE&) + void insert(iterator, int, TYPE&) + void insert(iterator, iterator, iterator) + int max_size() + void pop_back() + void pop_front() + void push_back(TYPE&) + void push_front(TYPE&) + iterator rbegin() + iterator rend() + void resize(int) + void resize(int, TYPE&) + int size() + void swap(container&) diff --git a/cython.py b/cython.py index c84a8003..c8987bbc 100644 --- a/cython.py +++ b/cython.py @@ -8,5 +8,5 @@ if __name__ == '__main__': main(command_line = 1) else: - # Void cython.* directives. + # Void cython.* directives. from Cython.Shadow import * diff --git a/runtests.py b/runtests.py index 5f27a055..2d20ebd2 100644 --- a/runtests.py +++ b/runtests.py @@ -85,7 +85,7 @@ class build_ext(_build_ext): def build_extension(self, ext): if ext.language == 'c++': try: - try: # Py2.7+ & Py3.2+ + try: # Py2.7+ & Py3.2+ compiler_obj = self.compiler_obj except AttributeError: compiler_obj = self.compiler @@ -351,17 +351,17 @@ class CythonCompileTestCase(unittest.TestCase): source = self.find_module_source_file( os.path.join(test_directory, module + '.pyx')) target = os.path.join(targetdir, self.build_target_filename(module)) - + if extra_compile_options is None: extra_compile_options = {} - + try: CompilationOptions except NameError: from Cython.Compiler.Main import CompilationOptions from Cython.Compiler.Main import compile as cython_compile from Cython.Compiler.Main import default_options - + options = CompilationOptions( default_options, include_path = include_dirs, @@ -377,7 +377,7 @@ class CythonCompileTestCase(unittest.TestCase): cython_compile(source, options=options, full_module_name=module) - def run_distutils(self, test_directory, module, workdir, incdir, + def run_distutils(self, test_directory, module, workdir, incdir, extra_extension_args=None): cwd = os.getcwd() os.chdir(workdir) @@ -392,10 +392,10 @@ class CythonCompileTestCase(unittest.TestCase): if match(module): ext_include_dirs += get_additional_include_dirs() self.copy_related_files(test_directory, workdir, module) - + if extra_extension_args is None: extra_extension_args = {} - + extension = Extension( module, sources = self.find_source_files(workdir, module), @@ -659,7 +659,7 @@ def collect_unittests(path, module_prefix, suite, selectors): return dirname == "Tests" loader = unittest.TestLoader() - + if include_debugger: skipped_dirs = [] else: @@ -698,7 +698,7 @@ def collect_doctests(path, module_prefix, suite, selectors): return dirname not in ("Mac", "Distutils", "Plex") def file_matches(filename): filename, ext = os.path.splitext(filename) - blacklist = ['libcython', 'libpython', 'test_libcython_in_gdb', + blacklist = ['libcython', 'libpython', 'test_libcython_in_gdb', 'TestLibCython'] return (ext == '.py' and not '~' in filename and not @@ -735,7 +735,7 @@ class EndToEndTest(unittest.TestCase): directory structure and its header gives a list of commands to run. """ cython_root = os.path.dirname(os.path.abspath(__file__)) - + def __init__(self, treefile, workdir, cleanup_workdir=True): self.treefile = treefile self.workdir = os.path.join(workdir, os.path.splitext(treefile)[0]) @@ -766,7 +766,7 @@ class EndToEndTest(unittest.TestCase): if self.cleanup_workdir: shutil.rmtree(self.workdir) os.chdir(self.old_dir) - + def runTest(self): commands = (self.commands .replace("CYTHON", "PYTHON %s" % os.path.join(self.cython_root, 'cython.py')) @@ -801,15 +801,15 @@ class EndToEndTest(unittest.TestCase): # TODO: Windows support. class EmbedTest(unittest.TestCase): - + working_dir = "Demos/embed" - + def setUp(self): self.old_dir = os.getcwd() os.chdir(self.working_dir) os.system( "make PYTHON='%s' clean > /dev/null" % sys.executable) - + def tearDown(self): try: os.system( @@ -817,7 +817,7 @@ class EmbedTest(unittest.TestCase): except: pass os.chdir(self.old_dir) - + def test_embed(self): from distutils import sysconfig libname = sysconfig.get_config_var('LIBRARY') @@ -881,7 +881,7 @@ class FileListExcluder: self.excludes[line.split()[0]] = True finally: f.close() - + def __call__(self, testname): return testname in self.excludes or testname.split('.')[-1] in self.excludes @@ -965,7 +965,7 @@ def main(): help="do not run the file based tests") parser.add_option("--no-pyregr", dest="pyregr", action="store_false", default=True, - help="do not run the regression tests of CPython in tests/pyregr/") + help="do not run the regression tests of CPython in tests/pyregr/") parser.add_option("--cython-only", dest="cython_only", action="store_true", default=False, help="only compile pyx to c, do not run C compiler or run the tests") @@ -1115,16 +1115,16 @@ def main(): # Chech which external modules are not present and exclude tests # which depends on them (by prefix) - missing_dep_excluder = MissingDependencyExcluder(EXT_DEP_MODULES) - version_dep_excluder = VersionDependencyExcluder(VER_DEP_MODULES) + missing_dep_excluder = MissingDependencyExcluder(EXT_DEP_MODULES) + version_dep_excluder = VersionDependencyExcluder(VER_DEP_MODULES) exclude_selectors = [missing_dep_excluder, version_dep_excluder] # want to pring msg at exit if options.exclude: exclude_selectors += [ re.compile(r, re.I|re.U).search for r in options.exclude ] - + if not test_bugs: exclude_selectors += [ FileListExcluder("tests/bugs.txt") ] - + if sys.platform in ['win32', 'cygwin'] and sys.version_info < (2,6): exclude_selectors += [ lambda x: x == "run.specialfloat" ] @@ -1175,7 +1175,7 @@ def main(): ignored_modules = ('Options', 'Version', 'DebugFlags', 'CmdLine') modules = [ module for name, module in sys.modules.items() if module is not None and - name.startswith('Cython.Compiler.') and + name.startswith('Cython.Compiler.') and name[len('Cython.Compiler.'):] not in ignored_modules ] if options.coverage: coverage.report(modules, show_missing=0) diff --git a/setup.py b/setup.py index a816e635..1afcc9d3 100644 --- a/setup.py +++ b/setup.py @@ -66,7 +66,7 @@ else: 'Cython' : [ p[7:] for p in pxd_include_patterns ], } -# This dict is used for passing extra arguments that are setuptools +# This dict is used for passing extra arguments that are setuptools # specific to setup setuptools_extra_args = {} diff --git a/tests/compile/food.h b/tests/compile/food.h index 9103c10b..af67df3b 100644 --- a/tests/compile/food.h +++ b/tests/compile/food.h @@ -1,8 +1,8 @@ -struct Tomato { - PyObject_HEAD -}; - -struct Bicycle{ - PyObject_HEAD -}; - +struct Tomato { + PyObject_HEAD +}; + +struct Bicycle{ + PyObject_HEAD +}; +