[PATCH V2 0/4] Fix pep8 in multiple files
V2: - Add files to PEP8 whitelist V1: - Fixes minor issues Rodrigo Trujillo (4): Fix pep8 in src/kimchi/vmtemplate.py Fix pep8 in src/kimchi/template.py Fix pep8 issues in src/kimchi/objectstore.py Fix pep8: add files to whitelist of Makefile.am Makefile.am | 3 +++ src/kimchi/objectstore.py | 6 +++--- src/kimchi/template.py | 13 ++++++++----- src/kimchi/vmtemplate.py | 16 ++++++++++------ 4 files changed, 24 insertions(+), 14 deletions(-) -- 1.8.5.3
Fixes minor pep8 issues Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 26f7d89..8d5217a 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os import string @@ -33,6 +33,7 @@ from lxml.builder import E QEMU_NAMESPACE = "xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'" + class VMTemplate(object): _bus_to_dev = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} @@ -110,9 +111,11 @@ class VMTemplate(object): qemu_stream_cmdline = """ <qemu:commandline> <qemu:arg value='-drive'/> - <qemu:arg value='file=%(url)s,if=none,id=drive-%(bus)s0-1-0,readonly=on,format=raw'/> + <qemu:arg value='file=%(url)s,if=none,id=drive-%(bus)s0-1-0,\ +readonly=on,format=raw'/> <qemu:arg value='-device'/> - <qemu:arg value='%(bus)s-cd,bus=%(bus)s.1,unit=0,drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> + <qemu:arg value='%(bus)s-cd,bus=%(bus)s.1,unit=0,\ +drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> </qemu:commandline> """ @@ -152,7 +155,8 @@ class VMTemplate(object): dev = "%s%s" % (self._bus_to_dev[self.info['disk_bus']], string.lowercase[index]) fmt = 'raw' if self._get_storage_type() in ['logical'] else 'qcow2' - params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], 'type': fmt} + params = {'src': src, 'dev': dev, 'bus': self.info['disk_bus'], + 'type': fmt} ret += """ <disk type='file' device='disk'> <driver name='qemu' type='%(type)s' cache='none'/> @@ -193,7 +197,7 @@ class VMTemplate(object): <target dev='%(dev)s' bus='scsi'/> </disk>""" if not self.fc_host_support: - disk_xml = disk_xml.replace('volume','block') + disk_xml = disk_xml.replace('volume', 'block') pool = self._storage_validate() # Creating disk xml for each lun passed @@ -323,7 +327,7 @@ class VMTemplate(object): qemu_stream_dns) if not urlparse.urlparse(self.info['cdrom']).scheme in \ - libvirt_stream_protocols and params.get('iso_stream', False): + libvirt_stream_protocols and params.get('iso_stream', False): params['qemu-namespace'] = QEMU_NAMESPACE params['qemu-stream-cmdline'] = cdrom_xml else: -- 1.8.5.3
Fix minor pep8 issues. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- src/kimchi/template.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/kimchi/template.py b/src/kimchi/template.py index 9bb2da5..60cd818 100644 --- a/src/kimchi/template.py +++ b/src/kimchi/template.py @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy import errno @@ -62,7 +62,7 @@ def validate_language(langs): def can_accept(mime): - if not cherrypy.request.headers.has_key('Accept'): + if not 'Accept' in cherrypy.request.headers: accepts = 'text/html' else: accepts = cherrypy.request.headers['Accept'] @@ -75,14 +75,17 @@ def can_accept(mime): return False + def can_accept_html(): return can_accept('text/html') or \ - can_accept('application/xaml+xml') or \ - can_accept('*/*') + can_accept('application/xaml+xml') or \ + can_accept('*/*') + def render(resource, data): if can_accept('application/json'): - cherrypy.response.headers['Content-Type'] = 'application/json;charset=utf-8' + cherrypy.response.headers['Content-Type'] = \ + 'application/json;charset=utf-8' return json.dumps(data, indent=2, separators=(',', ':')) elif can_accept_html(): paths = cherrypy.request.app.root.paths -- 1.8.5.3
Fix minor pep8 issues. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- src/kimchi/objectstore.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/objectstore.py b/src/kimchi/objectstore.py index d960ca9..8330e48 100644 --- a/src/kimchi/objectstore.py +++ b/src/kimchi/objectstore.py @@ -14,7 +14,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import json import sqlite3 @@ -36,7 +36,6 @@ class ObjectStoreSession(object): self.conn = conn self.conn.text_factory = lambda x: unicode(x, "utf-8", "ignore") - def get_list(self, obj_type): c = self.conn.cursor() res = c.execute('SELECT id FROM objects WHERE type=?', (obj_type,)) @@ -103,7 +102,8 @@ class ObjectStore(object): try: return self._connections[ident] except KeyError: - self._connections[ident] = sqlite3.connect(self.location, timeout=10) + self._connections[ident] = sqlite3.connect(self.location, + timeout=10) if len(self._connections.keys()) > 10: id, conn = self._connections.popitem(last=False) conn.interrupt() -- 1.8.5.3
This patch adds to whitelist: src/kimchi/objectstore.py src/kimchi/template.py src/kimchi/vmtemplate.py Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo@linux.vnet.ibm.com> --- Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index c68f050..6831b5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,13 +53,16 @@ PEP8_WHITELIST = \ src/kimchi/kvmusertests.py \ src/kimchi/mockmodel.py \ src/kimchi/model/*.py \ + src/kimchi/objectstore.py \ src/kimchi/osinfo.py \ src/kimchi/repositories.py \ src/kimchi/rollbackcontext.py \ src/kimchi/root.py \ src/kimchi/server.py \ src/kimchi/swupdate.py \ + src/kimchi/template.py \ src/kimchi/utils.py \ + src/kimchi/vmtemplate.py \ tests/test_config.py.in \ tests/test_mockmodel.py \ tests/test_model.py \ -- 1.8.5.3
participants (2)
-
Aline Manera -
Rodrigo Trujillo