# HG changeset patch
# User sylvain.thenault@logilab.fr
# Date 1232465346 -3600
# Node ID 0e52d72104a66f5415cc117f80d7e9abf4d4631e
# Parent  3a3ab6bbccc5f40db14d05f0092f5f64de83a729
pylint fixes

diff -r 3a3ab6bbccc5 -r 0e52d72104a6 common/appobject.py
--- a/common/appobject.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/common/appobject.py	Tue Jan 20 16:29:06 2009 +0100
@@ -1,7 +1,7 @@
 """Base class for dynamically loaded objects manipulated in the web interface
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -12,6 +12,8 @@
 from simplejson import dumps
 
 from logilab.common.deprecation import obsolete
+
+from rql.nodes import VariableRef, SubQuery
 from rql.stmts import Union, Select
 
 from cubicweb import Unauthorized
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 common/migration.py
--- a/common/migration.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/common/migration.py	Tue Jan 20 16:29:06 2009 +0100
@@ -346,7 +346,7 @@
             if optdescr[0] == 'added':
                 optdict = self.config.get_option_def(optdescr[1])
                 if optdict.get('default') is REQUIRED:
-                    self.config.input_option(option, optdict)
+                    self.config.input_option(optdescr[1], optdict)
         self.config.generate_config(open(newconfig, 'w'))
         show_diffs(configfile, newconfig)
         if exists(newconfig):
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 goa/__init__.py
--- a/goa/__init__.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/goa/__init__.py	Tue Jan 20 16:29:06 2009 +0100
@@ -28,7 +28,7 @@
     regular python datetime object
     """
     if yamstype is None:
-        yamstype = guess_yamstype_from_date(datetimeobj)
+        yamstype = guess_yamstype_for_date(datetimeobj)
     assert yamstype is not None
     if yamstype == 'Datetime':
         # don't use date, db model doesn't actually support it, only datetime
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 goa/db.py
--- a/goa/db.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/goa/db.py	Tue Jan 20 16:29:06 2009 +0100
@@ -391,7 +391,7 @@
 
     @classmethod
     def kind(cls):
-        return self.id
+        return cls.id
 
     @classmethod
     def properties(cls):
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 goa/tools/i18n.py
--- a/goa/tools/i18n.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/goa/tools/i18n.py	Tue Jan 20 16:29:06 2009 +0100
@@ -221,7 +221,7 @@
     os.chdir(appdirectory)
     potfiles = []
     if osp.exists(osp.join('i18n', 'entities.pot')):
-        potfiles = potfiles.append( osp.join('i18n', scfile) )
+        potfiles = potfiles.append( osp.join('i18n', 'entities.pot') )
     print '******** extract schema messages'
     schemapot = osp.join(tempdir, 'schema.pot')
     potfiles.append(schemapot)
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 server/migractions.py
--- a/server/migractions.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/server/migractions.py	Tue Jan 20 16:29:06 2009 +0100
@@ -11,7 +11,7 @@
 
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -679,11 +679,11 @@
         espschema = eschema.specializes()
         if repospschema and not espschema:
             self.rqlexec('DELETE X specializes Y WHERE X is EEType, X name %(x)s',
-                         {'x': str(repoechema)})
+                         {'x': str(repoeschema)})
         elif not repospschema and espschema:
             self.rqlexec('SET X specializes Y WHERE X is EEType, X name %(x)s, '
                          'Y is EEType, Y name %(y)s',
-                         {'x': str(repoechema), 'y': str(epschema)})
+                         {'x': str(repoeschema), 'y': str(espschema)})
         self.rqlexecall(ss.updateeschema2rql(eschema),
                         ask_confirm=self.verbosity >= 2)
         for rschema, targettypes, x in eschema.relation_definitions(True):
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 web/views/basecontrollers.py
--- a/web/views/basecontrollers.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/web/views/basecontrollers.py	Tue Jan 20 16:29:06 2009 +0100
@@ -235,7 +235,7 @@
                 stream.write(u'<div id="pageContent">')
                 vtitle = self.req.form.get('vtitle')
                 if vtitle:
-                    w(u'<h1 class="vtitle">%s</h1>\n' % vtitle)
+                    stream.write(u'<h1 class="vtitle">%s</h1>\n' % vtitle)
             view.pagination(req, rset, view.w, not view.need_navigation)
             if divid == 'pageContent':
                 stream.write(u'<div id="contentmain">')
diff -r 3a3ab6bbccc5 -r 0e52d72104a6 web/webconfig.py
--- a/web/webconfig.py	Mon Jan 19 19:57:41 2009 +0100
+++ b/web/webconfig.py	Tue Jan 20 16:29:06 2009 +0100
@@ -1,7 +1,7 @@
 """common web configuration for twisted/modpython applications
 
 :organization: Logilab
-:copyright: 2001-2008 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+:copyright: 2001-2009 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
 :contact: http://www.logilab.fr/ -- mailto:contact@logilab.fr
 """
 __docformat__ = "restructuredtext en"
@@ -349,6 +349,6 @@
         stream.close()
 
     def static_file_del(self, rpath):
-        if static_file_exists(rpath):
+        if self.static_file_exists(rpath):
             os.remove(join(self.static_directory, rpath))