Feature python3

.gitignore

@@ -25,3 +25,4 @@ test/demo.hforge.org/
 *.xhtml.ca
 *.xhtml.nl_BE
 ikaaro/ui_dev/aruni/node_modules/
+.idea

ikaaro/__init__.py

@@ -18,19 +18,28 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Import from standard library
+from logging import getLogger, NullHandler
 from sys import stderr
 
 # Import from itools
 from itools.core import get_abspath, get_version
 from itools.gettext import register_domain
 
 # Import from ikaaro
-from file import File
-from folder import Folder
-from registry import register_document_type
-from root import Root
-import text
-from webpage import WebPage
+# Add class to register
+from .root import Root
+from .file import File
+from .folder import Folder
+from .registry import register_document_type
+from . import text
+from .webpage import WebPage
+
+
+getLogger("ikaaro").addHandler(NullHandler())
+getLogger("ikaaro.web").addHandler(NullHandler())
+getLogger("ikaaro.update").addHandler(NullHandler())
+getLogger("ikaaro.access").addHandler(NullHandler())
+getLogger("ikaaro.cron").addHandler(NullHandler())
 
 
 # Check for required software
@@ -50,7 +59,7 @@
 
 
 # Import required modules
-import users
+from . import users
 
 # Register the itools domain
 path = get_abspath('locale')
@@ -59,7 +68,4 @@
 # Register document types
 register_document_type(WebPage)
 register_document_type(Folder)
-register_document_type(File)
-
-# Silent pyflakes
-Root
+register_document_type(File)

ikaaro/api/urls.py

@@ -18,13 +18,13 @@
 from ikaaro.urls import urlpattern
 
 # Import from here
-from views import Api_DocView, ApiStatus_View
-from views import Api_LoginView
-from views import ApiDevPanel_ResourceJSON, ApiDevPanel_ResourceRaw, ApiDevPanel_ResourceHistory
-from views import ApiDevPanel_ClassidViewDetails, ApiDevPanel_ClassidViewList
-from views import ApiDevPanel_Config, ApiDevPanel_Log
-from views import ApiDevPanel_CatalogReindex, UUIDView
-from views import ApiDevPanel_ServerView, ApiDevPanel_ServerStop
+from .views import Api_DocView, ApiStatus_View
+from .views import Api_LoginView
+from .views import ApiDevPanel_ResourceJSON, ApiDevPanel_ResourceRaw, ApiDevPanel_ResourceHistory
+from .views import ApiDevPanel_ClassidViewDetails, ApiDevPanel_ClassidViewList
+from .views import ApiDevPanel_Config, ApiDevPanel_Log
+from .views import ApiDevPanel_CatalogReindex, UUIDView
+from .views import ApiDevPanel_ServerView, ApiDevPanel_ServerStop
 
 
 urlpatterns = [
@@ -36,7 +36,6 @@
     urlpattern('/devpanel/classid', ApiDevPanel_ClassidViewList),
     urlpattern('/devpanel/classid/{class_id}', ApiDevPanel_ClassidViewDetails),
     # Resource
-    urlpattern('/devpanel/resource/{uuid}', UUIDView),
     urlpattern('/devpanel/resource/{uuid}/json', ApiDevPanel_ResourceJSON),
     urlpattern('/devpanel/resource/{uuid}/raw', ApiDevPanel_ResourceRaw),
     urlpattern('/devpanel/resource/{uuid}/history', ApiDevPanel_ResourceHistory),

ikaaro/api/views.py

@@ -59,10 +59,9 @@ def get_namespace(self, resource, context):
                   'methods': view.known_methods,
                   'description': view.__doc__}
             namespace['endpoints'].append(kw)
-            i +=1
+            i += 1
         return namespace
 
-
     def get_view_query_as_list(self, view, schema):
         l = []
         for key, field in schema.items():
@@ -74,13 +73,11 @@ def get_view_query_as_list(self, view, schema):
         return l
 
 
-
-
 class Api_View(ItoolsView):
 
     response_schema = {}
     route = None
-
+    use_cookies = False
 
     @classmethod
     def get_route(cls):
@@ -89,7 +86,6 @@ def get_route(cls):
         """
         return cls.route
 
-
     def get_resource(self, context):
         return context.resource
 
@@ -125,7 +121,7 @@ class UUIDView(Api_View):
     access = True
     known_methods = ['DELETE']
 
-    path_query_schema = {'uuid': Char_Field(title=MSG(u'The uuid of a resource in DB'))}
+    path_query_schema = {'uuid': Char_Field(title=MSG('The uuid of a resource in DB'))}
 
     def get_resource(self, context):
         query = get_resource_by_uuid_query(
@@ -142,7 +138,7 @@ def get_resource(self, context):
                 # Forbidden (403)
                 raise Forbidden
             raise NotFound
-        return search.get_resources(size=1).next()
+        return next(search.get_resources(size=1))
 
 
     access_DELETE = 'is_allowed_to_remove'
@@ -159,7 +155,7 @@ class ApiDevPanel_ResourceJSON(UUIDView):
 
     access = 'is_admin'
     known_methods = ['GET', 'DELETE']
-    query_schema = {'pretty': Boolean_Field(title=MSG(u'Pretty ?'))}
+    query_schema = {'pretty': Boolean_Field(title=MSG('Pretty ?'))}
 
     def GET(self, root, context):
         resource = self.get_resource(context)
@@ -194,10 +190,10 @@ class ApiDevPanel_ResourceHistory(UUIDView):
     access = 'is_admin'
     known_methods = ['GET', 'DELETE']
     response_schema = {
-        'sha': Char_Field(title=MSG(u'SHA of the commit')),
+        'sha': Char_Field(title=MSG('SHA of the commit')),
         'author_date': Datetime_Field(title=MSG("Datetime of commit")),
-        'author_name': Char_Field(title=MSG(u"Commit's author name")),
-        'message_short': Char_Field(title=MSG(u"Commit's title"))
+        'author_name': Char_Field(title=MSG("Commit's author name")),
+        'message_short': Char_Field(title=MSG("Commit's title"))
     }
     def GET(self, root, context):
         resource = self.get_resource(context)
@@ -229,11 +225,11 @@ class ApiDevPanel_ClassidViewDetails(Api_View):
     access = 'is_admin'
 
     path_query_schema = {
-        'class_id': Char_Field(title=MSG(u'A class_id registered in DB'))
+        'class_id': Char_Field(title=MSG('A class_id registered in DB'))
     }
     response_schema = {
-        'class_title': Char_Field(title=MSG(u'The class_title of the resource cls')),
-        'class_id': Char_Field(title=MSG(u'The class_id of the resource cls'))
+        'class_title': Char_Field(title=MSG('The class_title of the resource cls')),
+        'class_id': Char_Field(title=MSG('The class_id of the resource cls'))
     }
 
 
@@ -264,8 +260,8 @@ class Api_LoginView(Api_View):
 
     access = True
     known_methods = ['POST']
-    schema = {'email': Email_Field(title=MSG(u'Username'), required=True),
-              'password': Password_Field(title=MSG(u'Password'), required=True)}
+    schema = {'email': Email_Field(title=MSG('Username'), required=True),
+              'password': Password_Field(title=MSG('Password'), required=True)}
 
     def POST(self, root, context):
         raise NotImplementedError
@@ -316,9 +312,9 @@ class ApiDevPanel_ServerView(Api_View):
     access = 'is_admin'
     known_methods = ['GET']
     response_schema = {
-        'timestamp': Char_Field(title=MSG(u"Server's start timestamp")),
-        'pid': Integer_Field(title=MSG(u"Server's PID")),
-        'port': Integer_Field(title=MSG(u"Server's port"))
+        'timestamp': Char_Field(title=MSG("Server's start timestamp")),
+        'pid': Integer_Field(title=MSG("Server's PID")),
+        'port': Integer_Field(title=MSG("Server's port"))
     }
 
     def GET(self, root, context):

ikaaro/autoadd.py

@@ -22,13 +22,13 @@
 from itools.web import get_context, ERROR, FormError
 
 # Import from ikaaro
-from autoform import AutoForm
-from datatypes import BirthDate
-from datatypes import Days, Months, Years
-from buttons import Button
-from fields import Field
-import messages
-from widgets import HiddenWidget, ReadOnlyWidget
+from .autoform import AutoForm
+from .datatypes import BirthDate
+from .datatypes import Days, Months, Years
+from .buttons import Button
+from .fields import Field
+from . import messages
+from .widgets import HiddenWidget, ReadOnlyWidget
 
 
 
@@ -37,7 +37,7 @@ class AutoAdd(AutoForm):
 
     access = 'is_allowed_to_add'
 
-    actions = [Button(access=True, css='btn btn-primary', title=MSG(u'Add'))]
+    actions = [Button(access=True, css='btn btn-primary', title=MSG('Add'))]
     action_goto = None
     goto_view = None
     goto_parent_view = None # DEPRECATED -> use action_goto
@@ -77,7 +77,7 @@ def get_field(self, name):
     def _resource_class(self):
         context = self.context
 
-        class_id = context.query['type']
+        class_id = context.query.get('type')
         if not class_id:
             return None
         return context.database.get_resource_class(class_id)
@@ -90,10 +90,10 @@ def get_title(self, context):
         cls = self._resource_class
         if cls:
             class_title = cls.class_title.gettext()
-            title = MSG(u'Add {class_title}')
+            title = MSG('Add {class_title}')
             return title.gettext(class_title=class_title)
 
-        return MSG(u'Add resource').gettext()
+        return MSG('Add resource').gettext()
 
 
     def _get_datatype(self, resource, context, name):
@@ -162,11 +162,11 @@ def get_value(self, resource, context, name, datatype):
             # View cls_description
             value = getattr(self, name, None)
             if value is not None:
-                return value.gettext() if value else u''
+                return value.gettext() if value else ''
             # Resource cls_description
             cls = self._resource_class
             value = cls.class_description
-            return value.gettext() if value else u''
+            return value.gettext() if value else ''
         elif name == 'referrer':
             referrer = context.query.get('referrer')
             return referrer or context.get_referrer()
@@ -177,7 +177,7 @@ def get_value(self, resource, context, name, datatype):
 
         if getattr(datatype, 'multilingual', False):
             for language in resource.get_edit_languages(context):
-                value.setdefault(language, u'')
+                value.setdefault(language, '')
 
         return value
 
@@ -196,8 +196,8 @@ def get_container(self, resource, context, form):
         root = context.root
         if not root.has_permission(context.user, 'add', container, class_id):
             path = '/' if path == '.' else '/%s/' % path
-            msg = ERROR(u'Adding resources to {path} is not allowed.')
-            raise FormError, msg.gettext(path=path)
+            msg = ERROR('Adding resources to {path} is not allowed.')
+            raise FormError(msg.gettext(path=path))
 
         # Ok
         return container
@@ -228,17 +228,17 @@ def _get_form(self, resource, context):
         # 2. The name
         name = self.get_new_resource_name(form)
         if not name:
-            raise FormError, messages.MSG_NAME_MISSING
+            raise FormError(messages.MSG_NAME_MISSING)
         try:
             name = checkid(name)
         except UnicodeEncodeError:
             name = None
         if name is None:
-            raise FormError, messages.MSG_BAD_NAME
+            raise FormError(messages.MSG_BAD_NAME)
 
         # Check the name is free
         if container.get_resource(name, soft=True) is not None:
-            raise FormError, messages.MSG_NAME_CLASH
+            raise FormError(messages.MSG_NAME_CLASH)
         form['name'] = name
 
         # Ok
@@ -257,7 +257,7 @@ def set_value(self, resource, context, name, form):
 
         value = form[name]
         if type(value) is dict:
-            for language, data in value.iteritems():
+            for language, data in value.items():
                 resource.set_value(name, data, language=language)
         else:
             resource.set_value(name, value)

ikaaro/autoedit.py

@@ -29,18 +29,18 @@
 from itools.web import get_context
 
 # Import from ikaaro
-from autoform import AutoForm
-from widgets import HiddenWidget, timestamp_widget
-from datatypes import BirthDate
-from datatypes import Days, Months, Years
-from fields import Field
-import messages
-from views import ContextMenu
+from .autoform import AutoForm
+from .widgets import HiddenWidget, timestamp_widget
+from .datatypes import BirthDate
+from .datatypes import Days, Months, Years
+from .fields import Field
+from . import messages
+from .views import ContextMenu
 
 
 class EditLanguageMenu(ContextMenu):
 
-    title = MSG(u'Configuration')
+    title = MSG('Configuration')
     template = '/ui/ikaaro/generic/edit_language_menu.xml'
     view = None
 
@@ -52,7 +52,7 @@ def action(self):
     def _get_items(self):
         multilingual = False
         schema = self.view._get_schema(self.resource, self.context)
-        for key, datatype in schema.iteritems():
+        for key, datatype in schema.items():
             if getattr(datatype, 'multilingual', False):
                 multilingual = True
                 break
@@ -87,7 +87,7 @@ def display(self):
 class AutoEdit(AutoForm):
 
     access = 'is_allowed_to_edit'
-    title = MSG(u'Edit')
+    title = MSG('Edit')
 
     fields = ['title', 'description', 'subject']
     def get_fields(self):
@@ -149,7 +149,7 @@ def _get_query_fields(self, resource, context):
         default = set()
         to_keep = set()
 
-        for key, datatype in schema.iteritems():
+        for key, datatype in schema.items():
             # Keep readonly and mandatory widgets
             if getattr(datatype, 'mandatory', False):
                 to_keep.add(key)
@@ -314,7 +314,7 @@ def set_value(self, resource, context, name, form):
             return False
         value = form[name]
         if type(value) is dict:
-            for language, data in value.iteritems():
+            for language, data in value.items():
                 resource.set_value(name, data, language=language)
         else:
             resource.set_value(name, value)