Skip to content

Commit

Permalink
migrating to py3 only
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielmarcondes committed Jan 31, 2015
1 parent 59d153d commit c18d65c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ staticfiles/
static/
escenario/static/*.jpg
escenario/tempfiles/*.jpg
*.db
.env
.idea/
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: python
python:
- 2.7
- 3.3
- 3.4
env:
global:
- secure: jSXWLkfX/plvfFrR/aEJZHBcINgeYIYAbUVzLdn40Oe9vosWo+6WhEx6UFEqU5ZPlFr5KhHxMXktpFFjJZe+t8FhlzxbAJBfHOkQE4fVJYaO0EkahEd6crHjp7dJyLACu1i7+XqyrGkbupBh5APXf85uhBk4PNmrZM/y1AEoZcQ=
Expand Down
2 changes: 1 addition & 1 deletion generator/forms.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from models import Esc
from generator.models import Esc
from django import forms

class FormNewEscenario(forms.ModelForm):
Expand Down
2 changes: 1 addition & 1 deletion generator/tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from selenium import webdriver
from selenium.webdriver.common.keys import Keys
from model_mommy import mommy
from models import Esc, EscImg
from generator.models import Esc, EscImg
import os
import time
import requests
Expand Down
2 changes: 1 addition & 1 deletion generator/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from django.conf.urls import patterns, include, url
from views import Home, About, List, Restricted
from generator.views import Home, About, List, Restricted
from django.contrib.staticfiles.urls import staticfiles_urlpatterns

urlpatterns = patterns('',
Expand Down
8 changes: 3 additions & 5 deletions generator/views.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
from django.views.generic.base import View
from django.views.generic import TemplateView
from django.template import RequestContext
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.contrib.auth.decorators import login_required
from django.utils.decorators import method_decorator

from forms import FormNewEscenario
from models import Esc, EscImg
from generator.forms import FormNewEscenario
from generator.models import Esc, EscImg
import json


Expand Down Expand Up @@ -42,7 +40,7 @@ def post(self, request, *args, **kwargs):
if form.is_valid():
esc = form.instance
esc.save()
escimg = gera_imagem(esc, request.POST.has_key('autonumber'))
escimg = gera_imagem(esc, 'autonumber' in request.POST)
return redirect('/view/' + str(escimg.id))


Expand Down
1 change: 0 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,3 @@ selenium==2.44.0
six==1.9.0
static==1.1.1
static3==0.5.1
wsgiref==0.1.2

0 comments on commit c18d65c

Please sign in to comment.