Skip to content

Commit

Permalink
[fc] Repository: plone.recipe.zope2instance
Browse files Browse the repository at this point in the history
Branch: refs/heads/master
Date: 2019-03-13T09:24:01+01:00
Author: Mikel Larreategi (erral) <[email protected]>
Commit: plone/plone.recipe.zope2instance@182c000

use built-in function next. Fixes #82

Files changed:
M src/plone/recipe/zope2instance/ctl.py
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2019-03-13T09:24:30+01:00
Author: Mikel Larreategi (erral) <[email protected]>
Commit: plone/plone.recipe.zope2instance@95cb1eb

changelog

Files changed:
A news/82.bugfix
Repository: plone.recipe.zope2instance

Branch: refs/heads/master
Date: 2019-03-14T14:14:58+01:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/plone.recipe.zope2instance@3b8877d

Merge pull request #83 from plone/erral-issue-82

Use built-in function next

Files changed:
A news/82.bugfix
M src/plone/recipe/zope2instance/ctl.py
  • Loading branch information
mauritsvanrees committed Mar 14, 2019
1 parent ddb9689 commit 66bf6e2
Showing 1 changed file with 40 additions and 7 deletions.
47 changes: 40 additions & 7 deletions last_commit.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,48 @@
Repository: plone.restapi
Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-03-14T09:59:58+01:00
Author: Timo Stollenwerk (tisto) <stollenwerk@kitconcept.com>
Commit: https://github.com/plone/plone.restapi/commit/9b850b54f1f5ca07af19dae6198e7dbf06bfe690
Date: 2019-03-13T09:24:01+01:00
Author: Mikel Larreategi (erral) <mlarreategi@codesyntax.com>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/182c00096151a4dcd92bcf3b020d151c3b68548e

Amend changelog entry for p.a.controlpanel fix.
use built-in function next. Fixes #82

Files changed:
M news/696.bugfix
M src/plone/recipe/zope2instance/ctl.py

b'diff --git a/news/696.bugfix b/news/696.bugfix\nindex f6716a85..6a14aade 100644\n--- a/news/696.bugfix\n+++ b/news/696.bugfix\n@@ -1,2 +1,2 @@\n-- Fix 5.2 build by not including the deprecated package p.a.controlpanel\n- [sneridagh]\n+Do not depend on the deprecated plone.app.controlpanel package.\n+[sneridagh]\n'
b"diff --git a/src/plone/recipe/zope2instance/ctl.py b/src/plone/recipe/zope2instance/ctl.py\nindex 04fece5..d90319d 100644\n--- a/src/plone/recipe/zope2instance/ctl.py\n+++ b/src/plone/recipe/zope2instance/ctl.py\n@@ -603,7 +603,7 @@ def go(arg):\n # so that we can split on spaces while respecting quotes.\n tup = self.options.args\n if len(tup) == 1:\n- tup = csv.reader(tup, delimiter=' ').next()\n+ tup = next(csv.reader(tup, delimiter=' '))\n \n # Remove -c and add command name as sys.argv[0]\n cmd = ['import sys',\n"

Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-03-13T09:24:30+01:00
Author: Mikel Larreategi (erral) <[email protected]>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/95cb1eb7b8ed58a3483b717c17e1a9e338fc0abd

changelog

Files changed:
A news/82.bugfix

b'diff --git a/news/82.bugfix b/news/82.bugfix\nnew file mode 100644\nindex 0000000..efa957b\n--- /dev/null\n+++ b/news/82.bugfix\n@@ -0,0 +1 @@\n+Use built-in function next [erral]\n'

Repository: plone.recipe.zope2instance


Branch: refs/heads/master
Date: 2019-03-14T14:14:58+01:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: https://github.com/plone/plone.recipe.zope2instance/commit/3b8877d87dde53d1fd3c31e6215dcc21b9ab4068

Merge pull request #83 from plone/erral-issue-82

Use built-in function next

Files changed:
A news/82.bugfix
M src/plone/recipe/zope2instance/ctl.py

b"diff --git a/news/82.bugfix b/news/82.bugfix\nnew file mode 100644\nindex 0000000..efa957b\n--- /dev/null\n+++ b/news/82.bugfix\n@@ -0,0 +1 @@\n+Use built-in function next [erral]\ndiff --git a/src/plone/recipe/zope2instance/ctl.py b/src/plone/recipe/zope2instance/ctl.py\nindex 04fece5..d90319d 100644\n--- a/src/plone/recipe/zope2instance/ctl.py\n+++ b/src/plone/recipe/zope2instance/ctl.py\n@@ -603,7 +603,7 @@ def go(arg):\n # so that we can split on spaces while respecting quotes.\n tup = self.options.args\n if len(tup) == 1:\n- tup = csv.reader(tup, delimiter=' ').next()\n+ tup = next(csv.reader(tup, delimiter=' '))\n \n # Remove -c and add command name as sys.argv[0]\n cmd = ['import sys',\n"

0 comments on commit 66bf6e2

Please sign in to comment.