| 1 |
commit: a99414cc781b35d8089472f3c4d7916e4eeb494c |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 8 07:49:51 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 8 07:52:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=a99414cc |
| 7 |
|
| 8 |
SyncManager: rename async method to sync_async (bug 607922) |
| 9 |
|
| 10 |
This fixes the following DeprecationWarning with Python 3.6: |
| 11 |
|
| 12 |
pym/portage/sync/controller.py:117: DeprecationWarning: 'async' and 'await' will become reserved keywords in Python 3.7 |
| 13 |
def async(self, emerge_config=None, repo=None, master_hooks=True): |
| 14 |
|
| 15 |
X-Gentoo-Bug: 607922 |
| 16 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=607922 |
| 17 |
|
| 18 |
pym/portage/emaint/modules/sync/sync.py | 4 ++-- |
| 19 |
pym/portage/sync/controller.py | 13 +++++++++++-- |
| 20 |
2 files changed, 13 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/pym/portage/emaint/modules/sync/sync.py b/pym/portage/emaint/modules/sync/sync.py |
| 23 |
index 076297a..c8d4ca1 100644 |
| 24 |
--- a/pym/portage/emaint/modules/sync/sync.py |
| 25 |
+++ b/pym/portage/emaint/modules/sync/sync.py |
| 26 |
@@ -1,4 +1,4 @@ |
| 27 |
-# Copyright 2014-2015 Gentoo Foundation |
| 28 |
+# Copyright 2014-2017 Gentoo Foundation |
| 29 |
# Distributed under the terms of the GNU General Public License v2 |
| 30 |
|
| 31 |
import logging |
| 32 |
@@ -434,7 +434,7 @@ class SyncScheduler(AsyncScheduler): |
| 33 |
self._running_repos.add(node) |
| 34 |
self._update_leaf_nodes() |
| 35 |
|
| 36 |
- return self._sync_manager.async( |
| 37 |
+ return self._sync_manager.sync_async( |
| 38 |
emerge_config=self._emerge_config, |
| 39 |
repo=self._repo_map[node], |
| 40 |
master_hooks=self._master_hooks(node)) |
| 41 |
|
| 42 |
diff --git a/pym/portage/sync/controller.py b/pym/portage/sync/controller.py |
| 43 |
index 92be3cb..3bccf6f 100644 |
| 44 |
--- a/pym/portage/sync/controller.py |
| 45 |
+++ b/pym/portage/sync/controller.py |
| 46 |
@@ -1,4 +1,4 @@ |
| 47 |
-# Copyright 2014 Gentoo Foundation |
| 48 |
+# Copyright 2014-2017 Gentoo Foundation |
| 49 |
# Distributed under the terms of the GNU General Public License v2 |
| 50 |
|
| 51 |
from __future__ import print_function |
| 52 |
@@ -8,6 +8,7 @@ import sys |
| 53 |
import logging |
| 54 |
import grp |
| 55 |
import pwd |
| 56 |
+import warnings |
| 57 |
|
| 58 |
import portage |
| 59 |
from portage import os |
| 60 |
@@ -107,6 +108,14 @@ class SyncManager(object): |
| 61 |
level=logging.WARN, noiselevel=2) |
| 62 |
self.hooks[_dir] = hooks |
| 63 |
|
| 64 |
+ def __getattr__(self, name): |
| 65 |
+ if name == 'async': |
| 66 |
+ warnings.warn("portage.sync.controller.SyncManager.async " |
| 67 |
+ "has been renamed to sync_async", |
| 68 |
+ DeprecationWarning, stacklevel=2) |
| 69 |
+ return self.sync_async |
| 70 |
+ else: |
| 71 |
+ raise AttributeError(name) |
| 72 |
|
| 73 |
def get_module_descriptions(self, mod): |
| 74 |
desc = self.module_controller.get_func_descriptions(mod) |
| 75 |
@@ -114,7 +123,7 @@ class SyncManager(object): |
| 76 |
return desc |
| 77 |
return [] |
| 78 |
|
| 79 |
- def async(self, emerge_config=None, repo=None, master_hooks=True): |
| 80 |
+ def sync_async(self, emerge_config=None, repo=None, master_hooks=True): |
| 81 |
self.emerge_config = emerge_config |
| 82 |
self.settings, self.trees, self.mtimedb = emerge_config |
| 83 |
self.xterm_titles = "notitles" not in self.settings.features |
Archives