Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[automation]

gerrit-hooks has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 2:

* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[danken]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: py3: define __nonzero__ by means of __bool__
..


py3: define __nonzero__ by means of __bool__

Python 3 has renamed __nonzero__ to __bool__. As long as we support both
language flavours, we should have both methods defined.

https://docs.python.org/3/library/2to3.html?highlight=__nonzero__#2to3fixer-nonzero

Signed-off-by: Dan Kenigsberg 
Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Reviewed-on: https://gerrit.ovirt.org/62771
Continuous-Integration: Jenkins CI
Reviewed-by: Irit Goihman 
Reviewed-by: Yaniv Bronhaim 
Reviewed-by: Petr Horáček 
Tested-by: Edward Haas 
---
M lib/vdsm/network/ip/address.py
M lib/vdsm/network/netconfpersistence.py
M lib/vdsm/virt/utils.py
3 files changed, 16 insertions(+), 4 deletions(-)

Approvals:
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Petr Horáček: Looks good to me, but someone else must approve
  Irit Goihman: Looks good to me, but someone else must approve
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Verified



-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[danken]

Dan Kenigsberg has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1: Code-Review+2

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[edwardh]

Edward Haas has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1: Verified+1

Passing unit and functional tests.

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[phoracek]

Petr Horáček has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[ybronhei]

Yaniv Bronhaim has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[igoihman]

Irit Goihman has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1: Code-Review+1

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: Irit Goihman 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Yaniv Bronhaim 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[automation]

gerrit-hooks has posted comments on this change.

Change subject: py3: define __nonzero__ by means of __bool__
..


Patch Set 1:

* Update tracker: IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' 
and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6', 
'ovirt-4.0'])

-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
Gerrit-Reviewer: gerrit-hooks 
Gerrit-HasComments: No
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org

Change in vdsm[master]: py3: define __nonzero__ by means of __bool__

[danken]

Dan Kenigsberg has uploaded a new change for review.

Change subject: py3: define __nonzero__ by means of __bool__
..

py3: define __nonzero__ by means of __bool__

Python 3 has renamed __nonzero__ to __bool__. As long as we support both
language flavours, we should have both methods defined.

https://docs.python.org/3/library/2to3.html?highlight=__nonzero__#2to3fixer-nonzero

Signed-off-by: Dan Kenigsberg 
Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
---
M lib/vdsm/network/ip/address.py
M lib/vdsm/network/netconfpersistence.py
M lib/vdsm/virt/utils.py
3 files changed, 16 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/71/62771/1

diff --git a/lib/vdsm/network/ip/address.py b/lib/vdsm/network/ip/address.py
index 0842eb4..35f3eaa 100644
--- a/lib/vdsm/network/ip/address.py
+++ b/lib/vdsm/network/ip/address.py
@@ -57,8 +57,11 @@
 self.defaultRoute = defaultRoute
 self.bootproto = bootproto
 
-def __nonzero__(self):
+def __bool__(self):
 return bool(self.address or self.bootproto)
+
+def __nonzero__(self):  # TODO: drop when py2 is no longer needed
+return self.__bool__()
 
 def __repr__(self):
 return 'IPv4(%s, %s, %s, %s, %s)' % (self.address, self.netmask,
@@ -115,9 +118,12 @@
 self.ipv6autoconf = ipv6autoconf
 self.dhcpv6 = dhcpv6
 
-def __nonzero__(self):
+def __bool__(self):
 return bool(self.address or self.ipv6autoconf or self.dhcpv6)
 
+def __nonzero__(self):  # TODO: drop when py2 is no longer needed
+return self.__bool__()
+
 def __repr__(self):
 return 'IPv6(%s, %s, %s, %s, %s)' % (
 self.address, self.gateway, self.defaultRoute, self.ipv6autoconf,
diff --git a/lib/vdsm/network/netconfpersistence.py 
b/lib/vdsm/network/netconfpersistence.py
index 46d831a..37b9e89 100644
--- a/lib/vdsm/network/netconfpersistence.py
+++ b/lib/vdsm/network/netconfpersistence.py
@@ -89,9 +89,12 @@
 return '%s(%s, %s)' % (self.__class__.__name__, self.networks,
self.bonds)
 
-def __nonzero__(self):
+def __bool__(self):
 return True if self.networks or self.bonds else False
 
+def __nonzero__(self):  # TODO: drop when py2 is no longer needed
+return self.__bool__()
+
 @staticmethod
 def _confDictDiff(lhs, rhs):
 result = {}
diff --git a/lib/vdsm/virt/utils.py b/lib/vdsm/virt/utils.py
index 9d54f7d..ed79111 100644
--- a/lib/vdsm/virt/utils.py
+++ b/lib/vdsm/virt/utils.py
@@ -88,7 +88,7 @@
 with self._lock:
 del self._items[key]
 
-def __nonzero__(self):
+def __bool__(self):
 now = self._clock()
 with self._lock:
 expired_keys = [
@@ -100,6 +100,9 @@
 
 return bool(self._items)
 
+def __nonzero__(self):  # TODO: drop when py2 is no longer needed
+return self.__bool__()
+
 # private
 
 def _get_live(self, key):


-- 
To view, visit https://gerrit.ovirt.org/62771
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96beb2c794490def4ed904edd1c52ac2eb7b09a5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/vdsm-patches@lists.fedorahosted.org