Skip to content

Commit

Permalink
[fc] Repository: plone.staticresources
Browse files Browse the repository at this point in the history 
Branch: refs/heads/master
Date: 2020-09-02T15:48:46Z
Author: dependabot[bot] (dependabot[bot]) <49699333+dependabot[bot]@users.noreply.github.com>
Commit: plone/plone.staticresources@5578067

Bump bl in /src/plone/staticresources/static/components/mockup

Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](rvagg/bl@v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;

Files changed:
M src/plone/staticresources/static/components/mockup/yarn.lock
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2020-09-02T18:12:24+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.staticresources@c3a7da2

Create 97.bugfix

Files changed:
A news/97.bugfix
Repository: plone.staticresources

Branch: refs/heads/master
Date: 2020-09-02T18:12:54+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.staticresources@1e39b7a

Merge pull request #97 from plone/dependabot/npm_and_yarn/src/plone/staticresources/static/components/mockup/bl-4.0.3

Bump bl from 4.0.2 to 4.0.3 in /src/plone/staticresources/static/components/mockup

Files changed:
A news/97.bugfix
M src/plone/staticresources/static/components/mockup/yarn.lock
  • Loading branch information
@jensens
jensens committed Sep 2, 2020
1 parent 89aa5d5 commit c6353d1
Showing 1 changed file with 36 additions and 16 deletions.
52 changes: 36 additions & 16 deletions last_commit.txt
View file
Original file line number Diff line number Diff line change
@@ -1,34 +1,54 @@
Repository: plone.api
Repository: plone.staticresources


Branch: refs/heads/master
Date: 2020-09-02T14:52:42+02:00
Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org>
Commit: https://github.com/plone/plone.api/commit/a44f949c333a7c134f779150a97f6e1768e82669
Date: 2020-09-02T15:48:46Z
Author: dependabot[bot] (dependabot[bot]) <49699333+dependabot[bot]@users.noreply.github.com>
Commit: https://github.com/plone/plone.staticresources/commit/5578067a7e63d01b00ec9faff110e7f70384d550

Fixed deprecation warning for CMFPlone.interfaces.ILanguageSchema.
Bump bl in /src/plone/staticresources/static/components/mockup

Bumps [bl](https://github.com/rvagg/bl) from 4.0.2 to 4.0.3.
- [Release notes](https://github.com/rvagg/bl/releases)
- [Commits](https://github.com/rvagg/bl/compare/v4.0.2...v4.0.3)

Signed-off-by: dependabot[bot] &lt;support@github.com&gt;

Files changed:
M src/plone/staticresources/static/components/mockup/yarn.lock

b'diff --git a/src/plone/staticresources/static/components/mockup/yarn.lock b/src/plone/staticresources/static/components/mockup/yarn.lock\nindex 7df2d6bf..1ca1d9e8 100644\n--- a/src/plone/staticresources/static/components/mockup/yarn.lock\n+++ b/src/plone/staticresources/static/components/mockup/yarn.lock\n@@ -397,9 +397,9 @@ bindings@^1.5.0:\n file-uri-to-path "1.0.0"\n \n bl@^4.0.1:\n- version "4.0.2"\n- resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"\n- integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==\n+ version "4.0.3"\n+ resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"\n+ integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==\n dependencies:\n buffer "^5.5.0"\n inherits "^2.0.4"\n'

Repository: plone.staticresources


Branch: refs/heads/master
Date: 2020-09-02T18:12:24+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.staticresources/commit/c3a7da27d65d7bfb087485f6a50c36b05c8ad87d

Create 97.bugfix

Files changed:
A news/3130.bugfix
M src/plone/api/portal.py
A news/97.bugfix

b'diff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..9d05367\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed deprecation warning for ``CMFPlone.interfaces.ILanguageSchema``.\n+[maurits]\ndiff --git a/src/plone/api/portal.py b/src/plone/api/portal.py\nindex 19bff2b..f8e91f0 100644\n--- a/src/plone/api/portal.py\n+++ b/src/plone/api/portal.py\n@@ -402,16 +402,21 @@ def get_default_language():\n :Example: :ref:`portal_get_default_language_example`\n """\n try:\n- from Products.CMFPlone.interfaces import ILanguageSchema\n- except ImportError:\n- portal = get()\n- return portal.portal_properties.site_properties.getProperty(\n- \'default_language\', None,\n- )\n- else:\n- registry = getUtility(IRegistry)\n- settings = registry.forInterface(ILanguageSchema, prefix=\'plone\')\n- return settings.default_language\n+ # Plone 5.2+\n+ from plone.i18n.interfaces import ILanguageSchema\n+ except ImportError: # pragma: no cover\n+ try:\n+ # Plone 5.0/5.1\n+ from Products.CMFPlone.interfaces import ILanguageSchema\n+ except ImportError:\n+ # Plone 4.3\n+ portal = get()\n+ return portal.portal_properties.site_properties.getProperty(\n+ \'default_language\', None,\n+ )\n+ registry = getUtility(IRegistry)\n+ settings = registry.forInterface(ILanguageSchema, prefix=\'plone\')\n+ return settings.default_language\n \n \n def get_current_language(context=None):\n'
b'diff --git a/news/97.bugfix b/news/97.bugfix\nnew file mode 100644\nindex 00000000..0d9be6de\n--- /dev/null\n+++ b/news/97.bugfix\n@@ -0,0 +1 @@\n+Bumps bl from 4.0.2 to 4.0.3. [dependabot, jensens]\n'

Repository: plone.api
Repository: plone.staticresources


Branch: refs/heads/master
Date: 2020-09-02T18:08:51+02:00
Date: 2020-09-02T18:12:54+02:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: https://github.com/plone/plone.api/commit/6b30d03515e06f7c5d9488447bb314bcb670645f
Commit: https://github.com/plone/plone.staticresources/commit/1e39b7af2bf4223f4f6fc02db849e2623ddbd90d

Merge pull request #441 from plone/maurits/fix-warnings
Merge pull request #97 from plone/dependabot/npm_and_yarn/src/plone/staticresources/static/components/mockup/bl-4.0.3

Fixed deprecation warning for CMFPlone.interfaces.ILanguageSchema.
Bump bl from 4.0.2 to 4.0.3 in /src/plone/staticresources/static/components/mockup

Files changed:
A news/3130.bugfix
M src/plone/api/portal.py
A news/97.bugfix
M src/plone/staticresources/static/components/mockup/yarn.lock

b'diff --git a/news/3130.bugfix b/news/3130.bugfix\nnew file mode 100644\nindex 0000000..9d05367\n--- /dev/null\n+++ b/news/3130.bugfix\n@@ -0,0 +1,2 @@\n+Fixed deprecation warning for ``CMFPlone.interfaces.ILanguageSchema``.\n+[maurits]\ndiff --git a/src/plone/api/portal.py b/src/plone/api/portal.py\nindex 19bff2b..f8e91f0 100644\n--- a/src/plone/api/portal.py\n+++ b/src/plone/api/portal.py\n@@ -402,16 +402,21 @@ def get_default_language():\n :Example: :ref:`portal_get_default_language_example`\n """\n try:\n- from Products.CMFPlone.interfaces import ILanguageSchema\n- except ImportError:\n- portal = get()\n- return portal.portal_properties.site_properties.getProperty(\n- \'default_language\', None,\n- )\n- else:\n- registry = getUtility(IRegistry)\n- settings = registry.forInterface(ILanguageSchema, prefix=\'plone\')\n- return settings.default_language\n+ # Plone 5.2+\n+ from plone.i18n.interfaces import ILanguageSchema\n+ except ImportError: # pragma: no cover\n+ try:\n+ # Plone 5.0/5.1\n+ from Products.CMFPlone.interfaces import ILanguageSchema\n+ except ImportError:\n+ # Plone 4.3\n+ portal = get()\n+ return portal.portal_properties.site_properties.getProperty(\n+ \'default_language\', None,\n+ )\n+ registry = getUtility(IRegistry)\n+ settings = registry.forInterface(ILanguageSchema, prefix=\'plone\')\n+ return settings.default_language\n \n \n def get_current_language(context=None):\n'
b'diff --git a/news/97.bugfix b/news/97.bugfix\nnew file mode 100644\nindex 00000000..0d9be6de\n--- /dev/null\n+++ b/news/97.bugfix\n@@ -0,0 +1 @@\n+Bumps bl from 4.0.2 to 4.0.3. [dependabot, jensens]\ndiff --git a/src/plone/staticresources/static/components/mockup/yarn.lock b/src/plone/staticresources/static/components/mockup/yarn.lock\nindex 7df2d6bf..1ca1d9e8 100644\n--- a/src/plone/staticresources/static/components/mockup/yarn.lock\n+++ b/src/plone/staticresources/static/components/mockup/yarn.lock\n@@ -397,9 +397,9 @@ bindings@^1.5.0:\n file-uri-to-path "1.0.0"\n \n bl@^4.0.1:\n- version "4.0.2"\n- resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.2.tgz#52b71e9088515d0606d9dd9cc7aa48dc1f98e73a"\n- integrity sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==\n+ version "4.0.3"\n+ resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"\n+ integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==\n dependencies:\n buffer "^5.5.0"\n inherits "^2.0.4"\n'

0 comments on commit c6353d1

Please sign in to comment.