diff --git a/djangular/management/commands/startangularapp.py b/djangular/management/commands/startangularapp.py index e8ba807..325695d 100644 --- a/djangular/management/commands/startangularapp.py +++ b/djangular/management/commands/startangularapp.py @@ -11,13 +11,13 @@ class Command(utils.SiteAndPathUtils, TemplateCommand): "name in the current directory or optionally in the given " "directory.") - if django.get_version() > "1.7": + if django.get_version() >= "1.7": requires_system_checks = False else: requires_model_validation = False - def handle(self, app_name=None, target=None, **options): - mgmt.call_command('startapp', app_name, target, **options) + def handle(self, name, target=None, **options): + mgmt.call_command('startapp', name, target, **options) # Override the options to setup the template command. options.update({ @@ -28,5 +28,5 @@ def handle(self, app_name=None, target=None, **options): }) super(Command, self).handle( - 'app', app_name, target or app_name, **options) + 'app', name, target or name, **options) diff --git a/djangular/tests/middleware.py b/djangular/tests/middleware.py index 79e2efe..1d1bebd 100644 --- a/djangular/tests/middleware.py +++ b/djangular/tests/middleware.py @@ -11,25 +11,25 @@ def test_that_middleware_does_nothing_to_html_requests(self): mware = middleware.AngularJsonVulnerabilityMiddleware() mware.process_response(request.HttpRequest(), resp) - self.assertEqual(resp.content, '') + self.assertEqual(resp.content, b'') def test_that_middleware_does_nothing_to_js_requests(self): resp = response.HttpResponse(content_type='text/javascript', content='var blah = [];') mware = middleware.AngularJsonVulnerabilityMiddleware() mware.process_response(request.HttpRequest(), resp) - self.assertEqual(resp.content, 'var blah = [];') + self.assertEqual(resp.content, b'var blah = [];') def test_that_middleware_does_nothing_to_invalid_json_requests(self): resp = response.HttpResponse(content_type='application/json', content='[1, 2, 3]', status=400) mware = middleware.AngularJsonVulnerabilityMiddleware() mware.process_response(request.HttpRequest(), resp) - self.assertEqual(resp.content, '[1, 2, 3]') + self.assertEqual(resp.content, b'[1, 2, 3]') def test_that_middleware_adds_prefix_to_valid_json_requests(self): resp = response.HttpResponse(content_type='application/json', content='[1, 2, 3]') mware = middleware.AngularJsonVulnerabilityMiddleware() mware.process_response(request.HttpRequest(), resp) - self.assertEqual(resp.content, mware.CONTENT_PREFIX + '[1, 2, 3]') + self.assertEqual(resp.content, mware.CONTENT_PREFIX + b'[1, 2, 3]')