fixup

diff --git a/CHANGES b/CHANGES
index a424891..f470d3b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
 auf.django.emploi
 =================
 
 auf.django.emploi
 =================
 

+1.0
+---
+
+* changement statut
+* cleanup code
+* namespace fix
+

 0.9
 ---
 
 0.9
 ---
 

diff --git a/auf/__init__.py b/auf/__init__.py
index 35cf25b..de40ea7 100644 (file)
--- a/auf/__init__.py
+++ b/auf/__init__.py
@@ -1,5 +1 @@
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except:
-    # bootstrapping
-    pass
+__import__('pkg_resources').declare_namespace(__name__)

diff --git a/auf/django/__init__.py b/auf/django/__init__.py
index 35cf25b..de40ea7 100644 (file)
--- a/auf/django/__init__.py
+++ b/auf/django/__init__.py
@@ -1,5 +1 @@
-try:
-    __import__('pkg_resources').declare_namespace(__name__)
-except:
-    # bootstrapping
-    pass
+__import__('pkg_resources').declare_namespace(__name__)

diff --git a/auf/django/emploi/models.py b/auf/django/emploi/models.py
index 9b97cc6..efa52c6 100644 (file)
--- a/auf/django/emploi/models.py
+++ b/auf/django/emploi/models.py
@@ -1,8 +1,6 @@
 # -*- encoding: utf-8 -*
 
 # -*- encoding: utf-8 -*
 

-import datetime

 from django.core.files.storage import FileSystemStorage
 from django.core.files.storage import FileSystemStorage

-from tinymce import models as tinymce_models

 from django.db import models
 import datamaster_modeles.models as ref
 import settings
 from django.db import models
 import datamaster_modeles.models as ref
 import settings

@@ -43,9 +41,9 @@ SITUATION_CHOICES = (
 STATUT_CHOICES = (
     ('NOUV', 'Nouveau'),
     ('REC', 'Recevable'),
 STATUT_CHOICES = (
     ('NOUV', 'Nouveau'),
     ('REC', 'Recevable'),

-    ('SEL', 'Sélectionné'),
-    ('REF', 'Refusé'),
-    ('ACC', 'Accepté'),
+    ('SEL', 'Sélectionné pour entrevue'),
+    ('REF', 'Non retenu'),
+    ('ACC', 'À recruter'),

 )
 
 # PIECE CANDIDAT
 )
 
 # PIECE CANDIDAT

diff --git a/setup.py b/setup.py
index 929d569..3d43851 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 
 from setuptools import setup, find_packages
 # -*- encoding: utf-8 -*-
 
 from setuptools import setup, find_packages

-import sys, os

 
 name = 'auf.django.emploi'
 
 name = 'auf.django.emploi'

-version = '0.9'
+version = '1.0'

 
 setup(name=name,
       version=version,
 
 setup(name=name,
       version=version,

@@ -19,6 +18,7 @@ setup(name=name,
       author_email='contact@nilovna.com',
       url='http://pypi.auf.org/%s' % name,
       license='GPL',
       author_email='contact@nilovna.com',
       url='http://pypi.auf.org/%s' % name,
       license='GPL',

+      namespace_packages = ['auf', 'auf.django', ],

       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,