diff options
| author | Filipp Lepalaan <filipp@mac.com> | 2015-11-25 12:15:36 +0200 |
|---|---|---|
| committer | Filipp Lepalaan <filipp@mac.com> | 2015-11-25 12:15:36 +0200 |
| commit | 2298cfd9bbc5d45bca32243a6d54d20a697651ec (patch) | |
| tree | 95e64b82ccf6e56181961ec53df9b44ee6abee67 | |
| parent | d4a15caf7c56e8bb3bac247a0c8e3aa1420e642f (diff) | |
| download | Servo-2298cfd9bbc5d45bca32243a6d54d20a697651ec.tar.gz Servo-2298cfd9bbc5d45bca32243a6d54d20a697651ec.tar.bz2 Servo-2298cfd9bbc5d45bca32243a6d54d20a697651ec.zip | |
Cleanup
| -rw-r--r-- | servo/messaging/sms.py | 3 | ||||
| -rw-r--r-- | servo/stats/queries.py | 1 | ||||
| -rw-r--r-- | servo/urls/checkin.py | 1 | ||||
| -rw-r--r-- | settings.py | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/servo/messaging/sms.py b/servo/messaging/sms.py index 7f9535d..352a297 100644 --- a/servo/messaging/sms.py +++ b/servo/messaging/sms.py @@ -166,5 +166,6 @@ class HttpProvider: 'to' : number }) - f = urllib.urlopen("%s?%s" % (conf['sms_http_url'], params), context=_create_unverified_context()) + f = urllib.urlopen("%s?%s" % (conf['sms_http_url'], params), + context=_create_unverified_context()) return f.read() diff --git a/servo/stats/queries.py b/servo/stats/queries.py index 85c5dbd..df93146 100644 --- a/servo/stats/queries.py +++ b/servo/stats/queries.py @@ -11,6 +11,7 @@ class StatsManager: def _result(self, args): result = [] self.cursor.execute(self.sql, args) + for k, v in self.cursor.fetchall(): if isinstance(v, decimal.Decimal): v = float(v) diff --git a/servo/urls/checkin.py b/servo/urls/checkin.py index 13bdf66..aa772d7 100644 --- a/servo/urls/checkin.py +++ b/servo/urls/checkin.py @@ -16,5 +16,4 @@ urlpatterns = patterns( url(r'^checkin/print/(\w+)/$', print_confirmation, name='checkin-print'), url(r'^thanks/(\w+)/$', thanks, name='checkin-thanks'), url(r'^terms/$', terms, name='checkin-terms'), - ) diff --git a/settings.py b/settings.py index f02c048..30799c4 100644 --- a/settings.py +++ b/settings.py @@ -205,10 +205,9 @@ EMAIL_HOST_PASSWORD = '' EMAIL_HOST_USER = '' EMAIL_USE_TLS = True EMAIL_SUBJECT_PREFIX = '[Servo] ' +DEFAULT_FROM_EMAIL = 'support@servoapp.com' SERVER_EMAIL = 'servo@' + socket.gethostname() -DEFAULT_FROM_EMAIL = 'support@servoapp.com' - REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': ( 'rest_framework.authentication.TokenAuthentication', |