Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

Commit

Permalink
sorted imports
Browse files Browse the repository at this point in the history
  • Loading branch information
muddlebee committed Feb 27, 2017
1 parent 2595bc7 commit 9da1789
Show file tree
Hide file tree
Showing 41 changed files with 131 additions and 97 deletions.
1 change: 1 addition & 0 deletions infohub/settings.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os

BASE_DIR = os.path.dirname(os.path.dirname(__file__))


Expand Down
3 changes: 2 additions & 1 deletion infohub/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.conf.urls import patterns, include, url
from django.conf.urls import include, patterns, url
from django.contrib import admin

admin.autodiscover()

urlpatterns = patterns(
Expand Down
4 changes: 3 additions & 1 deletion infohub/wsgi.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
#email : [email protected]

import os
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "infohub.settings")

from django.core.wsgi import get_wsgi_application

os.environ.setdefault("DJANGO_SETTINGS_MODULE", "infohub.settings")

application = get_wsgi_application()
3 changes: 2 additions & 1 deletion malaria_api/serializers.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from rest_framework import serializers
from malaria_web.models import Post, MalariaUsers

from malaria_web.models import MalariaUsers, Post


class PostSerializer(serializers.ModelSerializer):
Expand Down
4 changes: 3 additions & 1 deletion malaria_api/tests.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
from datetime import datetime

from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.utils.six import BytesIO
from rest_framework import status
from rest_framework.parsers import JSONParser
from rest_framework.renderers import JSONRenderer
from rest_framework.test import APITestCase
from malaria_web.models import Post

from malaria_api.serializers import PostSerializer
from malaria_web.models import Post
from signup.models import Pcuser


Expand Down
8 changes: 4 additions & 4 deletions malaria_api/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
from malaria_web.models import Post, MalariaUsers
from malaria_api.serializers import PostSerializer, MalariaUserSerializer
from rest_framework import viewsets
from rest_framework import status
from rest_framework import status, viewsets
from rest_framework.decorators import api_view
from rest_framework.response import Response

from malaria_api.serializers import MalariaUserSerializer, PostSerializer
from malaria_web.models import MalariaUsers, Post


class PostViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Post.objects.all()
Expand Down
2 changes: 2 additions & 0 deletions malaria_web/forms.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from django.forms import ModelForm

from malaria_web.models import Post


class PostForm(ModelForm):
class Meta:
model = Post
Expand Down
3 changes: 2 additions & 1 deletion malaria_web/models.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.db import models
from django.core.validators import RegexValidator
from django.db import models

from signup.models import Pcuser


Expand Down
1 change: 1 addition & 0 deletions malaria_web/services.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.exceptions import ObjectDoesNotExist

from malaria_web.models import Post, RevPost


Expand Down
7 changes: 3 additions & 4 deletions malaria_web/tests.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from django.contrib.auth.models import User
from django.test import TestCase

from malaria_web.models import Post, RevPost
from malaria_web.services import (create_revpost,
delete_post_by_id,
get_post_by_id,
get_revposts_of_owner)
from malaria_web.services import (create_revpost, delete_post_by_id,
get_post_by_id, get_revposts_of_owner)
from signup.models import Pcuser


Expand Down
1 change: 1 addition & 0 deletions malaria_web/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls import patterns, url

from malaria_web import views

urlpatterns = patterns(
Expand Down
10 changes: 6 additions & 4 deletions malaria_web/views.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
from django.shortcuts import render
from django.http import Http404, HttpResponseRedirect
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import render

from malaria_web.forms import PostForm
from malaria_web.models import Post
from malaria_web.services import create_post_from_form, create_revpost, \
delete_post_by_id, get_post_by_id, get_revposts_of_owner
from malaria_web.services import (create_post_from_form, create_revpost,
delete_post_by_id, get_post_by_id,
get_revposts_of_owner)


def list_posts(request):
Expand Down
6 changes: 4 additions & 2 deletions manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@
import os
import sys
import uuid
from signup.models import Pcuser
from django.core.management import execute_from_command_line

from django.contrib.auth.models import User
from django.core.management import execute_from_command_line

from signup.models import Pcuser

if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "infohub.settings")
Expand Down
1 change: 1 addition & 0 deletions pcsa/forms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.forms import ModelForm

from pcsa.models import PcsaPost


Expand Down
3 changes: 2 additions & 1 deletion pcsa/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models

from signup.models import Pcuser


Expand All @@ -10,4 +11,4 @@ class PcsaPost(models.Model):
updated = models.DateTimeField(auto_now=True)

def __unicode__(self):
return self.owner.user.username
return self.owner.user.username
1 change: 1 addition & 0 deletions pcsa/serializers.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from rest_framework import serializers

from .models import PcsaPost


Expand Down
1 change: 1 addition & 0 deletions pcsa/services.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.exceptions import ObjectDoesNotExist

from pcsa.models import PcsaPost


Expand Down
9 changes: 5 additions & 4 deletions pcsa/tests.py
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
from django.contrib.auth.models import User
from django.test import TestCase
from pcsa.views import (delete_post_by_id,
get_post_by_id)
from datetime import datetime

from django.contrib.auth.models import User
from django.core.urlresolvers import reverse
from django.test import TestCase
from django.utils.six import BytesIO
from rest_framework import status
from rest_framework.parsers import JSONParser
from rest_framework.renderers import JSONRenderer
from rest_framework.test import APITestCase

from pcsa.models import PcsaPost
from pcsa.serializers import PcsaPostSerializer
from pcsa.views import delete_post_by_id, get_post_by_id
from signup.models import Pcuser


# Create your tests here.

class PcsaTests(APITestCase):
Expand Down
6 changes: 3 additions & 3 deletions pcsa/urls.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
from django.conf.urls import patterns, url, include
from pcsa_GHN import views as ghn_views
from pcsa import views
from django.conf.urls import include, patterns, url
from rest_framework import routers

from pcsa import views
from pcsa_GHN import views as ghn_views

urlpatterns = patterns(
'',
Expand Down
12 changes: 7 additions & 5 deletions pcsa/views.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
from django.shortcuts import render
from django.http import Http404, HttpResponseRedirect
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponseRedirect
from django.shortcuts import render
from rest_framework import viewsets

from pcsa.forms import PostForm
from pcsa.models import PcsaPost
from pcsa.services import create_post_from_form, \
delete_post_by_id, get_post_by_id
from rest_framework import viewsets
from pcsa.services import (create_post_from_form, delete_post_by_id,
get_post_by_id)

from .models import PcsaPost
from .serializers import PcsaPostSerializer

Expand Down
3 changes: 2 additions & 1 deletion pcsa_GHN/forms.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.forms import ModelForm
from pcsa_GHN.models import ghnPost, Contact

from pcsa_GHN.models import Contact, ghnPost


class ghnPostForm(ModelForm):
Expand Down
1 change: 1 addition & 0 deletions pcsa_GHN/models.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.db import models

from signup.models import Pcuser


Expand Down
3 changes: 2 additions & 1 deletion pcsa_GHN/serializers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from .models import *
from rest_framework import serializers

from .models import *


class ghnPostSerializer(serializers.ModelSerializer):
class Meta:
Expand Down
3 changes: 2 additions & 1 deletion pcsa_GHN/services.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.core.exceptions import ObjectDoesNotExist
from pcsa_GHN.models import ghnPost, Contact

from pcsa_GHN.models import Contact, ghnPost


def create_post_from_form(form, owner):
Expand Down
1 change: 1 addition & 0 deletions pcsa_GHN/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls import patterns, url

from pcsa_GHN import views

urlpatterns = patterns(
Expand Down
13 changes: 7 additions & 6 deletions pcsa_GHN/views.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import render
from rest_framework import viewsets

from .forms import ContactForm, ghnPostForm
from .models import Contact, ghnPost
from django.http import HttpResponse
from django.http import Http404, HttpResponseRedirect
from .serializers import ContactSerializer, ghnPostSerializer
from .services import *
from .forms import ghnPostForm, ContactForm
from django.core.urlresolvers import reverse
from .serializers import ghnPostSerializer, ContactSerializer
from rest_framework import viewsets


# Create your views here.

Expand Down
3 changes: 2 additions & 1 deletion pcsa_safety_tools/forms.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from django.forms import ModelForm

from .models import SafetyToolsPost


class SafetyToolsPostForm(ModelForm):
class Meta:
model = SafetyToolsPost
fields = ['category_id','title', 'description']
fields = ['category_id','title', 'description']
5 changes: 3 additions & 2 deletions pcsa_safety_tools/serializers.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
from .models import *
from rest_framework import serializers

from .models import *


class SafetyToolsPostSerializer(serializers.ModelSerializer):
class Meta:
model = SafetyToolsPost
fields = ('category_id','title', 'description', 'created_date')
fields = ('category_id','title', 'description', 'created_date')
5 changes: 3 additions & 2 deletions pcsa_safety_tools/services.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.core.exceptions import ObjectDoesNotExist
from .models import SafetyToolsPost, SafetyToolsCategory

from .models import SafetyToolsCategory, SafetyToolsPost


def create_post_from_form(form):
Expand Down Expand Up @@ -32,4 +33,4 @@ def get_post_by_id(post_id):
except ObjectDoesNotExist:
pass

return post
return post
3 changes: 2 additions & 1 deletion pcsa_safety_tools/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls import patterns, url

from pcsa_safety_tools import views

urlpatterns = patterns(
Expand All @@ -19,4 +20,4 @@
views.view_post,
name='view_post'),
url(r'^home/$', views.home, name='home')
)
)
12 changes: 6 additions & 6 deletions pcsa_safety_tools/views.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
from django.core.urlresolvers import reverse
from django.http import Http404, HttpResponse, HttpResponseRedirect
from django.shortcuts import render
from .models import SafetyToolsPost
from django.http import HttpResponse
from django.http import Http404, HttpResponseRedirect
from .services import *
from rest_framework import viewsets

from .forms import SafetyToolsPostForm
from django.core.urlresolvers import reverse
from .models import SafetyToolsPost
from .serializers import SafetyToolsPostSerializer
from rest_framework import viewsets
from .services import *


# Create your views here.
Expand Down
14 changes: 7 additions & 7 deletions profiles/views.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
from django.shortcuts import render
import jinja2
import uuid
from django.http import HttpResponse

import jinja2
from django.contrib.auth import authenticate, login, logout
from django.views.decorators.csrf import csrf_exempt
from django.contrib.auth.models import User
from django.http import HttpResponse
from django.shortcuts import render
from django.views.decorators.csrf import csrf_exempt
from jinja2.ext import loopcontrols
from rest_framework.decorators import api_view
from rest_framework.response import Response

from signup.models import *
from webhub.checker import check
from webhub.serializers import *
from signup.models import *


jinja_environ = jinja2.Environment(loader=jinja2.FileSystemLoader(['profiles/templates/profiles']), extensions=[loopcontrols])

Expand Down Expand Up @@ -233,4 +234,3 @@ def change_pass_page(request):
if retval <> None:
return retval
return HttpResponse(jinja_environ.get_template('change_password.html').render({"pcuser":request.user.pcuser}))

3 changes: 2 additions & 1 deletion signup/admin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.contrib import admin

from .models import Pcuser

admin.site.register(Pcuser)
admin.site.register(Pcuser)
Loading

0 comments on commit 9da1789

Please sign in to comment.