Skip to content

CLN: Fix many indentation errors found in #6643. #6646

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2014
Merged

CLN: Fix many indentation errors found in #6643. #6646

merged 1 commit into from
Jun 17, 2014

Conversation

dsm054
Copy link
Contributor

@dsm054 dsm054 commented Mar 15, 2014

Changes should only affect whitespace.

closes #6643

@@ -1,85 +1,87 @@
# reasonably efficient


Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi, I don't think this script is used anywhere.....

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, that means I won't worry about removing list from sorted(list(...))..

@jreback
Copy link
Contributor

jreback commented Mar 22, 2014

@dsm054 can you rebase (and remove the sql stuff)...then can merge

@jreback jreback added this to the 0.14.0 milestone Mar 22, 2014
@jreback
Copy link
Contributor

jreback commented Apr 5, 2014

@dsm054 can you rebase this....

@jreback jreback modified the milestones: 0.15.0, 0.14.0 Apr 21, 2014
@jreback
Copy link
Contributor

jreback commented May 30, 2014

@dsm054 want to rebase this?

@dsm054
Copy link
Contributor Author

dsm054 commented Jun 17, 2014

Okay, this is the next one up.

c_dtype='O'
recons.columns = np.array(lmap(Timestamp,recons.columns),
df.index = np.array(lmap(_to_uni,df.index),dtype=r_dtype)
if r_dtype == 'dt': # unicode
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be elif?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so -- otherwise won't the else always be taken if r_dtype=='u'? And the parallel if c_dtype: version has elif:.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to fix that, I can make a separate one-line PR.

@jreback jreback added PEP8 and removed Internals labels Jun 17, 2014
@jreback jreback modified the milestones: 0.14.1, 0.15.0 Jun 17, 2014
jreback added a commit that referenced this pull request Jun 17, 2014
CLN: Fix many indentation errors found in #6643.
@jreback jreback merged commit 463aa0d into pandas-dev:master Jun 17, 2014
@jreback
Copy link
Contributor

jreback commented Jun 17, 2014

ok make a one liner for that elif change pls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code Style Code style, linting, code_checks
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CLN: enforce four-space indentation
3 participants