PR: Use a menu separator constant instead of None #3795

mariacamilarg · 2016-12-07T01:17:57Z

ccordoba12 · 2016-12-07T20:50:17Z

spyder/utils/qthelpers.py

@@ -499,6 +499,10 @@ def show_std_icons():
    dialog.show()
    sys.exit(app.exec_())

+
+def get_menu_separator():


Let's call this menu_separator.

ccordoba12 · 2016-12-07T20:50:36Z

spyder/plugins/editor.py

@@ -973,25 +973,27 @@ def get_plugin_actions(self):
        # ---- File menu/toolbar construction ----
        self.recent_file_menu = QMenu(_("Open &recent"), self)
        self.recent_file_menu.aboutToShow.connect(self.update_recent_file_menu)
-
+
+        menu_separator = get_menu_separator()


Please remove this assigment

ccordoba12 · 2016-12-07T20:53:26Z

Thanks for working on this @mariacamilaremolinagutierrez :-)

However, there are many other places where None is used as menu separator (i.e. not just in the Editor).

Please find them all and do the same replacement you already did for the Editor.

…rator

ccordoba12 · 2016-12-09T20:43:15Z

There are a lot of style failures. Please review CircleCI to see how to fix them :-)

mariacamilarg · 2016-12-09T21:13:37Z

@ccordoba12 Wow there are, nice work on CI, it is super useful. I am making several commits but I'll squash the ones regarding style and some merges :)

Also, I'm not sure about this one:

E402: module level import not at top of file

Because that would mean changing the header structure:

Should I import it up?

ccordoba12 · 2016-12-09T21:29:03Z

Please don't change the import order in mainwindow. I carefully optimized it to start Spyder as fast as it's possible.

However, ciocheck is still reporting errors in plugins/editor.py and plugins/findinfiles.py

mariacamilarg · 2016-12-10T02:29:28Z

@ccordoba12 do you know how to re run tests without making another commit? I'm getting a HTTPError: 500 Server Error in the CI failure.

ccordoba12 · 2016-12-10T02:55:44Z

I restarted the build. There are still some failures (besides the import order :-)

mariacamilarg · 2016-12-10T15:52:30Z

@ccordoba12 I don't quite understand the last error I have left. How should I indent it?

goanpeca · 2016-12-10T16:27:27Z

@mariacamilaremolinagutierrez using \ to concatenate lines in Python is super ugly and I would strongly advice against using them. In this particular case you could concatenate stuff like this:

a = []
b = []
c = []
new = (a +
       b +
       ['something'] +
       c +
       ['something'])

You can also use the same for strings that are too long:

# a is a single string.
a = ('asdasdadsasdasd asd adasd ads ad asd asd ad ad ad asdas dasd asd adas '
     'asdasdasd asd s asd asd df a sd asd  d adsasdasd a ds asd  asd  asd  ad')

Parenthesis used like this serve the same purpose and make the code much cleaner.

Also PEP8 requires that the operators remain at the end of the line instead of at the beginning, so

# PEP8 ok
a = (5123123123123123123132134123123123132 +
     6)

# PEP8 fails
a = (5123123123123123123132134123123123132
     + 6)

Although that rule is not perfect to be honest...

style corrections style corrections 2 style corrections 3 total style corrections

…nagutierrez/spyder into menu_separator

mariacamilarg · 2016-12-10T22:06:40Z

@goanpeca Awesome! Thank you very much :)

@ccordoba12 The CI test that's failing is only the import one I mentioned earlier. And the style commits were squashed in one.

ccordoba12 · 2016-12-11T00:44:24Z

spyder/utils/qthelpers.py

@@ -499,6 +499,10 @@ def show_std_icons():
    dialog.show()
    sys.exit(app.exec_())

+
+def menu_separator():


Let's make this one a constant instead of a function to use it more easily, like this

menu_separator = None

then make it upper case!

Ok, sure, no problem with that :-)

ccordoba12 · 2016-12-11T00:45:07Z

Great job at fixing the style issues!

I left a last comment, then this would be ready :-)

rlaverde · 2016-12-12T12:22:13Z

Also PEP8 requires that the operators remain at the end of the line instead of at the beginning

@goanpeca Both ways are accepted, and operators at the beginning Knuth's style are preferred
https://www.python.org/dev/peps/pep-0008/#should-a-line-break-before-or-after-a-binary-operator

…rator

ccordoba12 · 2016-12-13T15:44:38Z

Thanks @mariacamilaremolinagutierrez, this looks good to me now :-)

Fixes #3794

now None is not used

29668db

ccordoba12 added this to the v3.1 milestone Dec 7, 2016

ccordoba12 reviewed Dec 7, 2016

View reviewed changes

mariacamilarg added 4 commits December 9, 2016 08:23

found and replaced all the None / menu separators

a066c7e

updating branch for changes in 3.x

7e37898

removing spyproject files

6a049a2

Merge remote-tracking branch 'refs/remotes/origin/3.x' into menu_sepa…

d064dbb

…rator

some style fixes

35cee5f

style corrections

d0420df

style corrections 2

35eb19d

mariacamilarg added 3 commits December 10, 2016 15:06

style corrections 3

7696fef

some style fixes

04373fb

style corrections style corrections 2 style corrections 3 total style corrections

Merge branch 'menu_separator' of https://github.com/mariacamilaremoli…

bc0314c

…nagutierrez/spyder into menu_separator

ccordoba12 reviewed Dec 11, 2016

View reviewed changes

mariacamilarg added 2 commits December 12, 2016 20:46

Merge remote-tracking branch 'refs/remotes/origin/3.x' into menu_sepa…

62aa407

…rator

replacing menu_separator() for an uppercase constant

9bb2bc8

ccordoba12 changed the title ~~PR: Use a menu_separator instead of None~~ PR: Use a menu separator constant instead of None Dec 13, 2016

ccordoba12 merged commit d121b60 into spyder-ide:3.x Dec 13, 2016

ccordoba12 added a commit that referenced this pull request Dec 13, 2016

Merge from 3.x: PR #3795

2f79be8

Fixes #3794

mariacamilarg deleted the menu_separator branch January 1, 2017 09:17

goanpeca assigned mariacamilarg Jan 13, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PR: Use a menu separator constant instead of None #3795

PR: Use a menu separator constant instead of None #3795

mariacamilarg commented Dec 7, 2016

ccordoba12 Dec 7, 2016

ccordoba12 Dec 7, 2016

ccordoba12 commented Dec 7, 2016

ccordoba12 commented Dec 9, 2016

mariacamilarg commented Dec 9, 2016

ccordoba12 commented Dec 9, 2016

mariacamilarg commented Dec 10, 2016

ccordoba12 commented Dec 10, 2016

mariacamilarg commented Dec 10, 2016

goanpeca commented Dec 10, 2016 •

edited

Loading

mariacamilarg commented Dec 10, 2016

ccordoba12 Dec 11, 2016 •

edited

Loading

goanpeca Dec 11, 2016

ccordoba12 Dec 11, 2016

ccordoba12 commented Dec 11, 2016

rlaverde commented Dec 12, 2016 •

edited

Loading

ccordoba12 commented Dec 13, 2016

PR: Use a menu separator constant instead of None #3795

PR: Use a menu separator constant instead of None #3795

Conversation

mariacamilarg commented Dec 7, 2016

ccordoba12 Dec 7, 2016

Choose a reason for hiding this comment

ccordoba12 Dec 7, 2016

Choose a reason for hiding this comment

ccordoba12 commented Dec 7, 2016

ccordoba12 commented Dec 9, 2016

mariacamilarg commented Dec 9, 2016

ccordoba12 commented Dec 9, 2016

mariacamilarg commented Dec 10, 2016

ccordoba12 commented Dec 10, 2016

mariacamilarg commented Dec 10, 2016

goanpeca commented Dec 10, 2016 • edited Loading

mariacamilarg commented Dec 10, 2016

ccordoba12 Dec 11, 2016 • edited Loading

Choose a reason for hiding this comment

goanpeca Dec 11, 2016

Choose a reason for hiding this comment

ccordoba12 Dec 11, 2016

Choose a reason for hiding this comment

ccordoba12 commented Dec 11, 2016

rlaverde commented Dec 12, 2016 • edited Loading

ccordoba12 commented Dec 13, 2016

goanpeca commented Dec 10, 2016 •

edited

Loading

ccordoba12 Dec 11, 2016 •

edited

Loading

rlaverde commented Dec 12, 2016 •

edited

Loading