general cleanup from stefan, != None must be is not None etc.

git-svn-id: https://pyjamas.svn.sourceforge.net/svnroot/pyjamas/trunk@785 7a2bd370-bda8-463c-979e-2900ccfb811e

CHANGELOG

@@ -1,6 +1,9 @@
                     Changes made to Pyjamas since 0.5p1
                     -----------------------------------
 
+ * Patch from Stefan Schwarzer to replace != None with is not None
+   and == None with is None, general clean-up.
+
  * Got SVG 2D Canvas addonsgallery example working under Pyjamas-Desktop
    (Gecko Engine).  Requires a patch to XulRunner, for drawImage to work:
    https://bugzilla.mozilla.org/show_bug.cgi?id=502234

doc/book/public/ui_module.txt

@@ -1639,7 +1639,7 @@ class TreeDemo(SimplePanel):
     def createItem(self, label, value=None):
         item = TreeItem(label)
         DOM.setStyleAttribute(item.getElement(), "cursor", "pointer")
-        if value != None:
+        if value is not None:
             item.setUserObject(value)
         return item
 

examples/infohierarchy/InfoDirectory.py

@@ -27,7 +27,7 @@
 class CollapserPanel(SimplePanel):
     def __init__(self, sink):
         SimplePanel.__init__(self)
-        self.sink = sink 
+        self.sink = sink
         self.caption = HTML()
         self.child = None 
         self.showing = False
@@ -120,10 +120,10 @@ def doDetachChildren(self):
         self.caption.onDetach()
 
     def setWidget(self, widget):
-        if self.child != None:
+        if self.child is not None:
             self.panel.remove(self.child)
 
-        if widget != None:
+        if widget is not None:
             self.panel.setWidget(1, 0, widget)
 
         self.child = widget

examples/infohierarchy/Trees.py

@@ -74,7 +74,7 @@ def __init__(self, text, children=None):
         self.text = text
         self.root = '/'
 
-        if children != None:
+        if children is not None:
             self.children = children
 
     def pathify(self):

examples/kitchensink/Trees.py

@@ -107,7 +107,7 @@ def __init__(self, text, children=None):
         self.item = None
         self.text = text
 
-        if children != None:
+        if children is not None:
             self.children = children
 
 

examples/mail/MailList.py

@@ -104,7 +104,7 @@ def selectRow(self, row):
         # When a row (other than the first one, which is used as a header) is
         # selected, display its associated MailItem.
         item = MailItems().getMailItem(self.startIndex + row)
-        if (item == None):
+        if item is None:
             return
 
         self.styleRow(self.selectedRow, False)

examples/shell/Popups.py

@@ -123,10 +123,10 @@ def doDetachChildren(self):
         self.caption.onDetach()
 
     def setWidget(self, widget):
-        if self.child != None:
+        if self.child is not None:
             self.panel.remove(self.child)
 
-        if widget != None:
+        if widget is not None:
             self.panel.setWidget(1, 0, widget)
 
         self.child = widget

examples/showcase/pyColourize.py

@@ -238,7 +238,7 @@ def Main():
             except:
                scheme = None
 
-    if input == None:
+    if input is None:
         # if there was no input specified then we try to
         # parse ourselves and do it in diffrent flavors.
         WebIt(sys.argv[0], '/MyDir/null', _Null, 1)
@@ -263,7 +263,7 @@ def WebAll(sourcePath, outdir=None, colors=None, show=0):
     # Then we need to colorize them with WebIt
     else:
         fileList = WalkDir(sourcePath)
-        if fileList != None:
+        if fileList is not None:
             for i in fileList:
                 c+=1
                 WebIt(i, outdir, colors, show)
@@ -273,11 +273,11 @@ def WebIt(sourcePath, outdir=None, colors=None, show=0):
     ''' Converts python source to html.
     '''
     print" Converting %s into HTML" % sourcePath                
-    if colors == None:
+    if colors is None:
         # Default colorscheme
         colors = _Dark
     # If no outdir is given we use the sourcePath
-    if outdir == None:
+    if outdir is None:
         htmlPath = sourcePath + '.html'
     else:
         # If we do give an outdir, and it does

examples/showcase/src/Showcase.py

@@ -139,7 +139,7 @@ def onTreeItemSelected(self, item):
         """ Respond to the user selecting an item in our tree.
         """
         demo = item.getUserObject()
-        if demo == None:
+        if demo is None:
             self.showDemo(None)
         else:
             self.showDemo(demo['name'])
@@ -154,7 +154,7 @@ def onTreeItemStateChanged(self, item):
     def showDemo(self, name):
         """ Show the demonstration with the given name.
         """
-        if self._curContents != None:
+        if self._curContents is not None:
             self._rightPanel.remove(self._curContents)
             self._curContents = None
 
@@ -164,7 +164,7 @@ def showDemo(self, name):
                 demo = d
                 break
 
-        if demo != None:
+        if demo is not None:
             exampleID = HTMLPanel.createUniqueId()
 
             html = []

examples/showcase/src/demos_widgets/tree.py

@@ -44,7 +44,7 @@ def __init__(self):
     def createItem(self, label, value=None):
         item = TreeItem(label)
         DOM.setStyleAttribute(item.getElement(), "cursor", "pointer")
-        if value != None:
+        if value is not None:
             item.setUserObject(value)
         return item
 

examples/showcase/src/uiHelpers.py

@@ -61,17 +61,17 @@ def indent(contents, all=None, left=None, right=None, top=None, bottom=None,
         Upon completion, we return a Panel object contained the wrapped-up
         contents.
     """
-    if all != None:
+    if all is not None:
         left   = all
         right  = all
         top    = all
         bottom = all
 
-    if hIndent != None:
+    if hIndent is not None:
         left  = hIndent
         right = hIndent
 
-    if vIndent != None:
+    if vIndent is not None:
         top    = vIndent
         bottom = vIndent
 
@@ -198,7 +198,7 @@ def showPanel(self, panelID):
         """
         if panelID == self._curPanelID: return
 
-        if self._curPanelID != None:
+        if self._curPanelID is not None:
             self._root.remove(self._panels[self._curPanelID])
 
         self._root.add(self._panels[panelID])

library/browser.py

@@ -2,11 +2,11 @@
 
 class Element:
     def __init__(self, tag=None, element=None):
-        if tag != None:
+        if tag is not None:
             JS('''
             this.element = $doc.createElement(tag);
             ''')
-        elif element != None:
+        elif element is not None:
             self.element = element
         else:
             raise Exception("Cannot create Element without tag or element")

library/gtk.py

@@ -25,7 +25,7 @@
 HAS_DEFAULT = 1024
 HAS_GRAB = 2048
 RC_STYLE = 4096
-COMPOSITE_CHILD	 = 8192
+COMPOSITE_CHILD = 8192
 NO_REPARENT = 16384
 APP_PAINTABLE = 32768
 RECEIVES_DEFAULT = 65536
@@ -42,6 +42,7 @@
 POS_TOP = 4
 POS_BOTTOM = 8
 
+
 class GObject:
     def __init__(self):
         self.callbacks = {}
@@ -402,7 +403,7 @@ def __init__(self, label=None):
         Bin.__init__(self)
         self.widget_cont.catchEvents(['click'], self)
         self.child = None
-        if label != None:
+        if label is not None:
             self.add(Label(label))
 
         self.widget_int.setStyle('textAlign','center')
@@ -480,7 +481,7 @@ def __init__(self, label=None):
         self.box.pack_start(self.check_widget, False)
         self.add(self.box)
 
-        if label!=None:
+        if label is not None:
             self.label = Label(label)
             self.box.pack_start(self.label, False)
         self.widget_int.setProperty('className','checkbutton')
@@ -512,7 +513,7 @@ class RadioButton(CheckButton):
     def __init__(self, group=None, label=None):
         CheckButton.__init__(self, label)
         self.check.setProperty('type','radio')
-        if group==None:
+        if group is None:
             self.group = RadioButton.counter
             RadioButton.counter += 1
             RadioButton.groups[self.group] = [self]
@@ -567,6 +568,7 @@ def _redraw(self):
         self.minwidth = self.img.getWidth()
         self.minheight = self.img.getHeight()
 
+
 class Label(Misc):
 
     def __init__(self, str=None):
@@ -642,7 +644,7 @@ def __init__(self, adjustment=None):
         self.value = browser.Element('div')
         self.value.setStyle('position', 'absolute')
         self.widget_cont.append(self.value)
-        if adjustment!=None:
+        if adjustment is not None:
             self.adjustment = adjustment
         else:
             self.adjustment = Adjustment()
@@ -1129,7 +1131,7 @@ def _clicked(self, elem, data=None):
 
     def _selected(self, elem, data=None):
         act = self.menu.get_active()
-        if act!=None:
+        if act is not None:
             self.label.set_text(act.label_cont)
 
     def set_menu(self, menu):

library/pyjamas/DOM.py

@@ -814,7 +814,7 @@ def eventGetCurrentEvent():
 def insertListItem(select, item, value, index):
     option = createElement("OPTION")
     setInnerText(option, item)
-    if value != None:
+    if value is not None:
         setAttribute(option, "value", value)
     if index == -1:
         appendChild(select, option)

library/pyjamas/DeferredCommand.py

@@ -17,7 +17,7 @@ def flushDeferredCommands(self):
             current = deferredCommands[0]
             del deferredCommands[0]
 
-            if current == None:
+            if current is None:
                 return
             else:
                 current.execute()

library/pyjamas/HTTPRequest.py

@@ -13,13 +13,13 @@
 class HTTPRequest:
     # also callable as: asyncPost(self, url, postData, handler)
     def asyncPost(self, user, pwd, url, postData=None, handler=None):
-        if postData == None:
+        if postData is None:
             return self.asyncPostImpl(None, None, user, pwd, url)
         return self.asyncPostImpl(user, pwd, url, postData, handler)
 
     # also callable as: asyncGet(self, url, handler)
     def asyncGet(self, user, pwd, url, handler):
-        if url == None:
+        if url is None:
             return self.asyncGetImpl(None, None, user, pwd)
         return self.asyncGetImpl(user, pwd, url, handler)
 

library/pyjamas/JSONService.py

@@ -15,7 +15,7 @@
 
 # no stream support
 class JSONService:
-    def __init__(self, url, handler = None):
+    def __init__(self, url, handler=None):
         """
         Create a JSON remote service object.  The url is the URL that will receive
         POST data with the JSON request.  See the JSON-RPC spec for more information.
@@ -28,10 +28,10 @@ def __init__(self, url, handler = None):
         self.handler = handler
 
     def callMethod(self, method, params, handler = None):
-        if handler == None:
+        if handler is None:
             handler = self.handler
 
-        if handler == None:
+        if handler is None:
             return self.__sendNotify(method, params)
         else:
             return self.__sendRequest(method, params, handler)
@@ -40,7 +40,7 @@ def onCompletion(self):
         pass
 
     def sendNotify(self, method, params):
-        msg = {"id":None, "method":method, "params":params}
+        msg = {"id": None, "method": method, "params": params}
         msg_data = dumps(msg)
         if not HTTPRequest().asyncPost(self.url, msg_data, self):
             return -1

library/pyjamas/Window.py

@@ -150,7 +150,7 @@ def fireClosingImpl():
     ret = None
     for listener in closingListeners:
         msg = listener.onWindowClosing()
-        if ret == None:
+        if ret is None:
             ret = msg
     return ret
 

library/pyjamas/platform/DOMPyJS.py

@@ -799,7 +799,7 @@ def eventGetCurrentEvent():
 def insertListItem(select, item, value, index):
     option = createElement("OPTION")
     setInnerText(option, item)
-    if value != None:
+    if value is not None:
         setAttribute(option, "value", value)
     if index == -1:
         appendChild(select, option)

library/pyjamas/platform/HTTPRequestPyJS.py

@@ -3,13 +3,13 @@ class HTTPRequest:
     # also callable as: asyncPost(self, url, postData, handler)
     def asyncPost(self, user, pwd, url, postData=None, handler=None,
                                         returnxml=0):
-        if postData == None:
+        if postData is None:
             return self.asyncPostImpl(None, None, user, pwd, url, returnxml)
         return self.asyncPostImpl(user, pwd, url, postData, handler, returnxml)
 
     # also callable as: asyncGet(self, url, handler)
     def asyncGet(self, user, pwd, url, handler, returnxml=0):
-        if url == None:
+        if url is None:
             return self.asyncGetImpl(None, None, user, pwd, returnxml)
         return self.asyncGetImpl(user, pwd, url, handler, returnxml)
 

library/pyjamas/platform/JSONServicePyJS.py

@@ -15,10 +15,10 @@ def __init__(self, url, handler = None):
         self.handler = handler
 
     def callMethod(self, method, params, handler = None):
-        if handler == None:
+        if handler is None:
             handler = self.handler
 
-        if handler == None:
+        if handler is None:
             return self.__sendNotify(method, params)
         else:
             return self.__sendRequest(method, params, handler)

library/pyjamas/ui/AbsolutePanel.py

@@ -27,7 +27,7 @@ def __init__(self):
     def add(self, widget, left=None, top=None):
         ComplexPanel.add(self, widget, self.getElement())
 
-        if left != None:
+        if left is not None:
             self.setWidgetPosition(widget, left, top)
 
     def setWidgetPosition(self, widget, left, top):

library/pyjamas/ui/AutoComplete.py

@@ -121,12 +121,12 @@ def complete(self):
 
 class SimpleAutoCompletionItems:
     def __init__(self, items = None):
-        if items == None:
+        if items is None:
             items = []
         self.completions = items
 
     def getCompletionItems(self, match):
-        matches = []        
+        matches = []
         match = match.lower()
 
         for i in range(len(self.completions)):