From 4194e8ee556f3109057fab0afb7894927b52713e Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 30 Sep 2015 02:08:19 +0300 Subject: Cleanup --- servo/management/commands/cleandups.py | 24 ------------------------ servo/management/commands/clearcache.py | 24 ------------------------ servo/management/commands/cron.py | 2 +- servo/management/commands/dbbackup.py | 6 +++--- servo/management/commands/updateprices.py | 2 +- 5 files changed, 5 insertions(+), 53 deletions(-) (limited to 'servo/management/commands') diff --git a/servo/management/commands/cleandups.py b/servo/management/commands/cleandups.py index fa333bf..a7a2d46 100644 --- a/servo/management/commands/cleandups.py +++ b/servo/management/commands/cleandups.py @@ -1,28 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, First Party Software -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. import logging from django.core.management.base import BaseCommand diff --git a/servo/management/commands/clearcache.py b/servo/management/commands/clearcache.py index 826ddef..7c00ef4 100644 --- a/servo/management/commands/clearcache.py +++ b/servo/management/commands/clearcache.py @@ -1,28 +1,4 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, First Party Software -# All rights reserved. - -# Redistribution and use in source and binary forms, with or without modification, -# are permitted provided that the following conditions are met: - -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. - -# 2. Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT -# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. from django.core.cache import cache from django.core.management.base import BaseCommand diff --git a/servo/management/commands/cron.py b/servo/management/commands/cron.py index d1b2806..5255104 100755 --- a/servo/management/commands/cron.py +++ b/servo/management/commands/cron.py @@ -49,7 +49,7 @@ class Command(BaseCommand): po = PurchaseOrder.objects.get(pk=details.purchaseOrderNumber) po.invoice_id = i po.invoice.save("%s.pdf" % i, File(open(details.invoiceData))) - except Exception, e: + except Exception as e: raise e def update_warranty(self): diff --git a/servo/management/commands/dbbackup.py b/servo/management/commands/dbbackup.py index 4858b77..af253a1 100644 --- a/servo/management/commands/dbbackup.py +++ b/servo/management/commands/dbbackup.py @@ -2,8 +2,8 @@ import os import sys +import subprocess from time import strftime -from subprocess import call from django.conf import settings from django.core.management.base import BaseCommand @@ -15,6 +15,6 @@ class Command(BaseCommand): db = settings.DATABASES['default'] fn = '%s_%s.pgdump' % (db['NAME'], strftime('%Y%m%d_%H%I')) fn = os.path.join(settings.BACKUP_DIR, fn) - - call(['/Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dump', '-Fc', db['NAME'], '-U', db['USER'], + + subprocess.call(['/Applications/Postgres.app/Contents/Versions/9.3/bin/pg_dump', '-Fc', db['NAME'], '-U', db['USER'], '-f' , fn], env={'PGPASSWORD': db['PASSWORD']}) diff --git a/servo/management/commands/updateprices.py b/servo/management/commands/updateprices.py index c3a073c..50da680 100644 --- a/servo/management/commands/updateprices.py +++ b/servo/management/commands/updateprices.py @@ -33,7 +33,7 @@ class Command(BaseCommand): i.update_price() i.save() counter += 1 - except Exception, e: + except Exception as e: logging.debug(e) print '%d product prices updated' % counter -- cgit v1.2.3