File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -860,6 +860,7 @@ def new_release(sender, **kwargs):
860860 build = build , version = new_version )
861861 return release
862862
863+
863864# define update/delete callbacks for synchronizing
864865# models with the configuration management backend
865866
@@ -887,13 +888,13 @@ def _log_config_updated(**kwargs):
887888def _etcd_publish_key (** kwargs ):
888889 key = kwargs ['instance' ]
889890 _etcd_client .write ('/deis/builder/users/{}/{}' .format (
890- key .owner .username , fingerprint (key .public )), key .public )
891+ key .owner .username , fingerprint (key .public )), key .public )
891892
892893
893894def _etcd_purge_key (** kwargs ):
894895 key = kwargs ['instance' ]
895896 _etcd_client .delete ('/deis/builder/users/{}/{}' .format (
896- key .owner .username , fingerprint (key .public )))
897+ key .owner .username , fingerprint (key .public )))
897898
898899
899900def _etcd_purge_user (** kwargs ):
Original file line number Diff line number Diff line change @@ -133,7 +133,8 @@ def test_build_hook(self):
133133 'checksum' : checksum ,
134134 'procfile' : {'web' : 'node server.js' },
135135 'config' : {'PATH' : '/usr/local/bin:/usr/bin:/usr/sbin' },
136- 'url' : 'http://deis-controller.local/slugs/{app_id}-{sha}.tar.gz' .format (** locals ()),
136+ 'url' :
137+ 'http://deis-controller.local/slugs/{app_id}-{sha}.tar.gz' .format (** locals ()),
137138 'size' : 12345 }
138139 # post the build without a session
139140 self .assertIsNone (self .client .logout ())
@@ -162,4 +163,3 @@ def test_build_hook(self):
162163 self .assertIn ('web' , databag ['containers' ])
163164 self .assertIn ('1' , databag ['containers' ]['web' ])
164165 self .assertEqual (databag ['containers' ]['web' ]['1' ], 'up' )
165-
Original file line number Diff line number Diff line change 2323from rest_framework .generics import get_object_or_404
2424from rest_framework .response import Response
2525
26- from api import models , serializers , tasks
26+ from api import models , serializers
2727
2828from deis import settings
2929
Original file line number Diff line number Diff line change @@ -332,7 +332,7 @@ def readable_datetime(datetime_str):
332332 else :
333333 return "{}{}ago" .format (hour_str , min_str )
334334 # if it happened yesterday, say "yesterday at 3:23 pm"
335- yesterday = now + relativedelta .relativedelta (days = - 1 )
335+ yesterday = now + relativedelta .relativedelta (days = - 1 )
336336 if delta .days <= 2 and dt .day == yesterday .day :
337337 return dt .strftime ("Yesterday at %X" )
338338 # otherwise return locale-specific date/time format
Original file line number Diff line number Diff line change 313313try :
314314 if os .path .exists ('/app/confd_settings.py' ):
315315 sys .path .append ('/app' )
316- from confd_settings import *
316+ from confd_settings import * # noqa
317317except ImportError :
318318 pass
319319
You can’t perform that action at this time.
0 commit comments