Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24746 → Rev 24747

/trunk/Scribus/OSX-package/linktools/MachO.py
7,7 → 7,7
"find the framework folder for FW name"
if path == "" or path == "@executable_path" or path == "/":
return None
elif name == None:
elif name is None:
return findFramework(os.path.dirname(path),
os.path.basename(path))
elif os.path.basename(path) == name + ".framework":
/trunk/Scribus/OSX-package/linktools/ingest.py
48,7 → 48,7
print "Error: unknown option: " + sys.argv[argp]
usage()
sys.exit(1)
elif bundle == None:
elif bundle is None:
bundle = sys.argv[argp]
argp = argp + 1
else:
56,7 → 56,7
usage()
sys.exit(1)
 
if bundle == None:
if bundle is None:
print "Error: no bundle path specified!"
usage()
sys.exit(1)
/trunk/Scribus/OSX-package/linktools/mkappbundle.py
48,7 → 48,7
print "Error: unknown option: " + sys.argv[argp]
usage()
sys.exit(1)
elif bundle == None:
elif bundle is None:
bundle = sys.argv[argp]
argp = argp + 1
else:
56,7 → 56,7
usage()
sys.exit(1)
 
if bundle == None:
if bundle is None:
print "Error: no bundle path specified!"
usage()
sys.exit(1)
/trunk/Scribus/OSX-package/linktools/mkframework.py
53,7 → 53,7
print "Error: unknown option: " + sys.argv[argp]
usage()
sys.exit(1)
elif bundle == None:
elif bundle is None:
bundle = sys.argv[argp]
argp = argp + 1
else:
61,7 → 61,7
usage()
sys.exit(1)
 
if bundle == None:
if bundle is None:
print "Error: no bundle path specified!"
usage()
sys.exit(1)
/trunk/Scribus/codegen/fromrelaxng/impldescription.py
54,9 → 54,9
def addIncludes(self, datatypes, refnames):
#print datatypes, refnames
for p in self.properties:
if p.datatype == None and p.refname in refnames:
if p.datatype is None and p.refname in refnames:
p.datatype = refnames[p.refname].datatype
if p.datatype == None:
if p.datatype is None:
print "X>>>", p.name, p.refname, refnames
if p.datatype.find("<") > 0:
/trunk/Scribus/codegen/fromrelaxng/parserng.py
27,7 → 27,7
self.currentClass = c
elif self.currentClass != None:
newProp = Property(pattern, isOptional, isCollection)
if newProp.datatype == None:
if newProp.datatype is None:
ref = pattern.getchildren()[0]
if ref.tag == qn('rng:ref'):
newProp.refname = ref.get(an('name'))
/trunk/Scribus/scribus/plugins/scripter/new_api.py
8,7 → 8,7
 
 
def is_camelcase(s):
return cc_re.match(s) != None
return cc_re.match(s) is not None
 
 
def to_camelcase(s):
/trunk/Scribus/scribus/plugins/scripter/python/sceditor/console.py
157,7 → 157,7
 
 
def run(self, source, locals=None):
if locals == None:
if locals is None:
locals = self.locals
code = compile(source, self.name, "exec")
try:
/trunk/Scribus/scribus/plugins/scripter/python/sceditor/widget.py
58,7 → 58,7
def _get_block(self, line_no=None):
cursor = self.editview.textCursor()
row = cursor.blockNumber()
if line_no == None:
if line_no is None:
line_no = row
block = cursor.block()
while row > line_no:
/trunk/Scribus/scribus/plugins/scriptplugin/scripts/CalendarWizard.py
649,7 → 649,7
cal = ScVerticalEventCalendar(year, months, self.weekVar.get(), draw, self.sepMonthsVar.get(), self.key)
self.master.withdraw()
err = cal.createCalendar()
if err != None:
if err is not None:
self.master.deiconify()
self.statusVar.set(err)
else:
/trunk/Scribus/scribus/plugins/scriptplugin_py2x/scripts/CalendarWizard.py
649,7 → 649,7
cal = ScVerticalEventCalendar(year, months, self.weekVar.get(), draw, self.sepMonthsVar.get(), self.key)
self.master.withdraw()
err = cal.createCalendar()
if err != None:
if err is not None:
self.master.deiconify()
self.statusVar.set(err)
else: