diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-08-18 11:51:25 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-08-18 11:51:25 -0600 |
| commit | fbd6510d58a47ea0d166c48a82793f05425406e4 (patch) | |
| tree | 330ce703eb02d20f96099c3fe0fc36ae33d4905b /numpy/lib/recfunctions.py | |
| parent | 8ddb0ce0acafe75d78df528b4d2540dfbf4b364d (diff) | |
| download | numpy-fbd6510d58a47ea0d166c48a82793f05425406e4.tar.gz | |
STY: Giant comma spacing fixup.
Run the 2to3 ws_comma fixer on *.py files. Some lines are now too long
and will need to be broken at some point. OTOH, some lines were already
too long and need to be broken at some point. Now seems as good a time
as any to do this with open PRs at a minimum.
Diffstat (limited to 'numpy/lib/recfunctions.py')
| -rw-r--r-- | numpy/lib/recfunctions.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/recfunctions.py b/numpy/lib/recfunctions.py index 827e60d70..ae4ee56c6 100644 --- a/numpy/lib/recfunctions.py +++ b/numpy/lib/recfunctions.py @@ -900,7 +900,7 @@ def join_by(key, r1, r2, jointype='inner', r1postfix='1', r2postfix='2', (r1names, r2names) = (r1.dtype.names, r2.dtype.names) # Check the names for collision - if (set.intersection(set(r1names),set(r2names)).difference(key) and + if (set.intersection(set(r1names), set(r2names)).difference(key) and not (r1postfix or r2postfix)): msg = "r1 and r2 contain common names, r1postfix and r2postfix " msg += "can't be empty" |