"
+ phantom.exit()
+else
+ port = phantom.args[0]
+ server = require("webserver").create()
+
+ service = server.listen(port, (request, response) ->
+
+ console.log "Request at " + new Date()
+ console.log JSON.stringify(request, null, 4)
+
+ response.statusCode = 200
+ response.headers =
+ Cache: "no-cache"
+ "Content-Type": "text/html"
+
+ response.write ""
+ response.write ""
+ response.write "Hello, world!"
+ response.write ""
+ response.write ""
+ response.write "This is from PhantomJS web server.
"
+ response.write "Request data:
"
+ response.write ""
+ response.write JSON.stringify(request, null, 4)
+ response.write "
"
+ response.write ""
+ response.write ""
+ )
+ if service
+ console.log "Web server running on port " + port
+ else
+ console.log "Error: Could not create web server listening on port " + port
+ phantom.exit()
diff -Nru phantomjs-1.3.0+dfsg/examples/simpleserver.js phantomjs-1.4.0+dfsg/examples/simpleserver.js
--- phantomjs-1.3.0+dfsg/examples/simpleserver.js 1970-01-01 00:00:00.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/simpleserver.js 2011-12-27 13:46:57.000000000 +0000
@@ -0,0 +1,40 @@
+var port, server, service;
+
+if (phantom.args.length !== 1) {
+ console.log('Usage: simpleserver.js ');
+ phantom.exit();
+} else {
+ port = phantom.args[0];
+ server = require('webserver').create();
+
+ service = server.listen(port, function (request, response) {
+
+ console.log('Request at ' + new Date());
+ console.log(JSON.stringify(request, null, 4));
+
+ response.statusCode = 200;
+ response.headers = {
+ 'Cache': 'no-cache',
+ 'Content-Type': 'text/html'
+ };
+ response.write('');
+ response.write('');
+ response.write('Hello, world!');
+ response.write('');
+ response.write('');
+ response.write('This is from PhantomJS web server.
');
+ response.write('Request data:
');
+ response.write('');
+ response.write(JSON.stringify(request, null, 4));
+ response.write('');
+ response.write('');
+ response.write('');
+ });
+
+ if (service) {
+ console.log('Web server running on port ' + port);
+ } else {
+ console.log('Error: Could not create web server listening on port ' + port);
+ phantom.exit();
+ }
+}
diff -Nru phantomjs-1.3.0+dfsg/examples/technews.coffee phantomjs-1.4.0+dfsg/examples/technews.coffee
--- phantomjs-1.3.0+dfsg/examples/technews.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/technews.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -1,4 +1,4 @@
-page = new WebPage()
+page = require('webpage').create()
page.viewportSize = { width: 320, height: 480 }
diff -Nru phantomjs-1.3.0+dfsg/examples/technews.js phantomjs-1.4.0+dfsg/examples/technews.js
--- phantomjs-1.3.0+dfsg/examples/technews.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/technews.js 2011-12-27 13:46:57.000000000 +0000
@@ -1,4 +1,4 @@
-var page = new WebPage();
+var page = require('webpage').create();
page.viewportSize = { width: 320, height: 480 };
page.open('http://news.google.com/news/i/section?&topic=t', function (status) {
if (status !== 'success') {
diff -Nru phantomjs-1.3.0+dfsg/examples/tweets.coffee phantomjs-1.4.0+dfsg/examples/tweets.coffee
--- phantomjs-1.3.0+dfsg/examples/tweets.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/tweets.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -1,6 +1,6 @@
# Get twitter status for given account (or for the default one, "sencha")
-page = new WebPage()
+page = require('webpage').create()
twitterId = 'sencha' #< default value
# Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
diff -Nru phantomjs-1.3.0+dfsg/examples/tweets.js phantomjs-1.4.0+dfsg/examples/tweets.js
--- phantomjs-1.3.0+dfsg/examples/tweets.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/tweets.js 2011-12-27 13:46:57.000000000 +0000
@@ -1,6 +1,6 @@
// Get twitter status for given account (or for the default one, "sencha")
-var page = new WebPage(),
+var page = require('webpage').create(),
twitterId = "sencha"; //< default value
// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
diff -Nru phantomjs-1.3.0+dfsg/examples/unrandomize.coffee phantomjs-1.4.0+dfsg/examples/unrandomize.coffee
--- phantomjs-1.3.0+dfsg/examples/unrandomize.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/unrandomize.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -1,7 +1,7 @@
# Modify global object at the page initialization.
# In this example, effectively Math.random() always returns 0.42.
-page = new WebPage()
+page = require('webpage').create()
page.onInitialized = ->
page.evaluate ->
Math.random = ->
diff -Nru phantomjs-1.3.0+dfsg/examples/unrandomize.js phantomjs-1.4.0+dfsg/examples/unrandomize.js
--- phantomjs-1.3.0+dfsg/examples/unrandomize.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/unrandomize.js 2011-12-27 13:46:57.000000000 +0000
@@ -1,7 +1,7 @@
// Modify global object at the page initialization.
// In this example, effectively Math.random() always returns 0.42.
-var page = new WebPage();
+var page = require('webpage').create();
page.onInitialized = function () {
page.evaluate(function () {
diff -Nru phantomjs-1.3.0+dfsg/examples/useragent.coffee phantomjs-1.4.0+dfsg/examples/useragent.coffee
--- phantomjs-1.3.0+dfsg/examples/useragent.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/useragent.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -1,4 +1,4 @@
-page = new WebPage()
+page = require('webpage').create()
console.log 'The default user agent is ' + page.settings.userAgent
diff -Nru phantomjs-1.3.0+dfsg/examples/useragent.js phantomjs-1.4.0+dfsg/examples/useragent.js
--- phantomjs-1.3.0+dfsg/examples/useragent.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/useragent.js 2011-12-27 13:46:57.000000000 +0000
@@ -1,4 +1,4 @@
-var page = new WebPage();
+var page = require('webpage').create();
console.log('The default user agent is ' + page.settings.userAgent);
page.settings.userAgent = 'SpecialAgent';
page.open('http://www.httpuseragent.org', function (status) {
diff -Nru phantomjs-1.3.0+dfsg/examples/waitfor.coffee phantomjs-1.4.0+dfsg/examples/waitfor.coffee
--- phantomjs-1.3.0+dfsg/examples/waitfor.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/waitfor.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -30,7 +30,7 @@
interval = setInterval f, 250 #< repeat check every 250ms
-page = new WebPage()
+page = require('webpage').create()
# Open Twitter on 'sencha' profile and, onPageLoad, do...
page.open 'http://twitter.com/#!/sencha', (status) ->
diff -Nru phantomjs-1.3.0+dfsg/examples/waitfor.js phantomjs-1.4.0+dfsg/examples/waitfor.js
--- phantomjs-1.3.0+dfsg/examples/waitfor.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/waitfor.js 2011-12-27 13:46:57.000000000 +0000
@@ -34,7 +34,7 @@
};
-var page = new WebPage();
+var page = require('webpage').create();
// Open Twitter on 'sencha' profile and, onPageLoad, do...
page.open("http://twitter.com/#!/sencha", function (status) {
diff -Nru phantomjs-1.3.0+dfsg/examples/weather.coffee phantomjs-1.4.0+dfsg/examples/weather.coffee
--- phantomjs-1.3.0+dfsg/examples/weather.coffee 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/weather.coffee 2011-12-27 13:46:57.000000000 +0000
@@ -1,6 +1,6 @@
# Get weather info for given address (or for the default one, "Mountain View")
-page = new WebPage()
+page = require('webpage').create()
address = 'Mountain View' #< default value
# Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
diff -Nru phantomjs-1.3.0+dfsg/examples/weather.js phantomjs-1.4.0+dfsg/examples/weather.js
--- phantomjs-1.3.0+dfsg/examples/weather.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/examples/weather.js 2011-12-27 13:46:57.000000000 +0000
@@ -1,6 +1,6 @@
// Get weather info for given address (or for the default one, "Mountain View")
-var page = new WebPage(),
+var page = require('webpage').create(),
address = "Mountain View"; //< default value
// Route "console.log()" calls from within the Page context to the main Phantom context (i.e. current "this")
diff -Nru phantomjs-1.3.0+dfsg/.gitignore phantomjs-1.4.0+dfsg/.gitignore
--- phantomjs-1.3.0+dfsg/.gitignore 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/.gitignore 2011-12-27 13:46:57.000000000 +0000
@@ -2,7 +2,7 @@
*.pro.user*
*.xcodeproj
Makefile*
-bin/
+bin/phantomjs
*~
*.moc
moc_*
diff -Nru phantomjs-1.3.0+dfsg/python/INSTALL.md phantomjs-1.4.0+dfsg/python/INSTALL.md
--- phantomjs-1.3.0+dfsg/python/INSTALL.md 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/INSTALL.md 2011-12-27 13:46:57.000000000 +0000
@@ -5,7 +5,8 @@
* PyQt4 >= 4.8.0
* Qt >= 4.7.0
-* python-argparse == (Python 2.6)
+* python-argparse >= 1.2.1 (Python 2.6 only)
+* PIL (python-imaging-library) >= 1.1.7 (optional; for rendering to GIF)
### INSTALLING
-------------------------
@@ -16,11 +17,14 @@
>
[Python](http://www.python.org/download/)
[PyQt4](http://www.riverbankcomputing.co.uk/software/pyqt/download)
- Qt4 - PyQt4 comes packaged with the Qt runtime library(s)
+> Qt4 - PyQt4 comes packaged with the Qt runtime library(s)
+>
+ [python-argparse](http://pypi.python.org/pypi/argparse/)
+ [PIL](http://www.pythonware.com/products/pil/)
Ubuntu
-> Open a terminal window, and enter the command `sudo apt-get install python-qt4`
+> Open a terminal window, and enter the command `sudo apt-get install python-qt4 python-imaging`
>
All the required packages should be automatically pulled in and installed.
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/arguments.py phantomjs-1.4.0+dfsg/python/pyphantomjs/arguments.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/arguments.py 1970-01-01 00:00:00.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/arguments.py 2011-12-27 13:46:57.000000000 +0000
@@ -0,0 +1,264 @@
+'''
+ This file is part of the PyPhantomJS project.
+
+ Copyright (C) 2011 James Roe
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+'''
+
+import argparse
+import codecs
+import os
+import sys
+
+from PyQt4.QtCore import qInstallMsgHandler, QObject, qWarning
+from PyQt4.QtNetwork import QNetworkProxy
+from PyQt4.QtWebKit import QWebPage
+
+from __init__ import __version__
+from plugincontroller import do_action
+from utils import debug, MessageHandler, QPyFile
+
+
+license = '''
+ PyPhantomJS Version %s
+
+ Copyright (C) 2011 James Roe
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+''' % __version__
+
+
+defaults = {
+ 'cookiesFile': None,
+ 'debug': None,
+ 'diskCache': False,
+ 'ignoreSslErrors': False,
+ 'loadImages': True,
+ 'loadPlugins': False,
+ 'localToRemoteUrlAccessEnabled': False,
+ 'maxDiskCacheSize': -1,
+ 'outputEncoding': 'System',
+ 'proxy': None,
+ 'proxyType': QNetworkProxy.HttpProxy,
+ 'scriptEncoding': 'utf-8',
+ 'verbose': False
+}
+
+
+def argParser():
+ class YesOrNoAction(argparse.Action):
+ '''Converts yes or no arguments to True/False respectively'''
+ def __call__(self, parser, namespace, value, option_string=None):
+ answer = True if value == 'yes' else False
+ setattr(namespace, self.dest, answer)
+
+ def proxyType(type_):
+ if type_ == QNetworkProxy.HttpProxy:
+ return 'http'
+ elif type_ == QNetworkProxy.Socks5Proxy:
+ return 'socks5'
+
+ yesOrNo = lambda d: 'yes' if d else 'no'
+
+
+ parser = argparse.ArgumentParser(
+ description='Minimalistic headless WebKit-based JavaScript-driven tool',
+ usage='%(prog)s [options] script.[js|coffee] [script argument [script argument ...]]',
+ formatter_class=argparse.RawTextHelpFormatter
+ )
+
+ parser.add_argument('script', metavar='script.[js|coffee]', nargs='?',
+ help='The script to execute, and any args to pass to it'
+ )
+ parser.add_argument('-v', '--version',
+ action='version', version=license,
+ help="show this program's version and license"
+ )
+
+ program = parser.add_argument_group('program options')
+ script = parser.add_argument_group('script options')
+ debug = parser.add_argument_group('debug options')
+
+ program.add_argument('--config', metavar='/path/to/config',
+ help='Specifies path to a JSON-formatted config file'
+ )
+ program.add_argument('--disk-cache', default=defaults['diskCache'], action=YesOrNoAction,
+ choices=['yes', 'no'],
+ help='Enable disk cache (default: %s)' % yesOrNo(defaults['diskCache'])
+ )
+ program.add_argument('--ignore-ssl-errors', default=defaults['ignoreSslErrors'], action=YesOrNoAction,
+ choices=['yes', 'no'],
+ help='Ignore SSL errors (default: %s)' % yesOrNo(defaults['ignoreSslErrors'])
+ )
+ program.add_argument('--max-disk-cache-size', default=defaults['maxDiskCacheSize'], metavar='size', type=int,
+ help='Limits the size of disk cache (in KB)'
+ )
+ program.add_argument('--output-encoding', default=defaults['outputEncoding'], metavar='encoding',
+ help='Sets the encoding used for terminal output (default: %(default)s)'
+ )
+ program.add_argument('--proxy', metavar='address:port',
+ help='Set the network proxy'
+ )
+ program.add_argument('--proxy-type', default=defaults['proxyType'], metavar='type',
+ help='Set the network proxy type (default: %s)' % proxyType(defaults['proxyType'])
+ )
+ program.add_argument('--script-encoding', default=defaults['scriptEncoding'], metavar='encoding',
+ help='Sets the encoding used for scripts (default: %(default)s)'
+ )
+
+ script.add_argument('--cookies-file', metavar='/path/to/cookies.txt',
+ help='Sets the file name to store the persistent cookies'
+ )
+ script.add_argument('--load-images', default=defaults['loadImages'], action=YesOrNoAction,
+ choices=['yes', 'no'],
+ help='Load all inlined images (default: %s)' % yesOrNo(defaults['loadImages'])
+ )
+ script.add_argument('--load-plugins', default=defaults['loadPlugins'], action=YesOrNoAction,
+ choices=['yes', 'no'],
+ help='Load all plugins (i.e. Flash, Silverlight, ...) (default: %s)' % yesOrNo(defaults['loadPlugins'])
+ )
+ script.add_argument('--local-to-remote-url-access', default=defaults['localToRemoteUrlAccessEnabled'], action=YesOrNoAction,
+ choices=['yes', 'no'],
+ help='Local content can access remote URL (default: %s)' % yesOrNo(defaults['localToRemoteUrlAccessEnabled'])
+ )
+
+ debug.add_argument('--debug', choices=['exception', 'program'], metavar='option',
+ help=('Debug the program with pdb\n'
+ ' exception : Start debugger when program hits exception\n'
+ ' program : Start the program with the debugger enabled')
+ )
+ debug.add_argument('--verbose', action='store_true',
+ help='Show verbose debug messages'
+ )
+
+ do_action('ArgParser')
+
+ return parser
+
+
+def parseArgs(app, args):
+ # Handle all command-line options
+ p = argParser()
+ arg_data = p.parse_known_args(args)
+ args = arg_data[0]
+ args.script_args = arg_data[1]
+
+ # convert script args to unicode
+ for i, arg in enumerate(args.script_args):
+ args.script_args[i] = unicode(arg, 'utf-8')
+
+ # register an alternative Message Handler
+ messageHandler = MessageHandler(args.verbose)
+ qInstallMsgHandler(messageHandler.process)
+
+ file_check = (args.cookies_file, args.config)
+ for file_ in file_check:
+ if file_ is not None and not os.path.exists(file_):
+ sys.exit("No such file or directory: '%s'" % file_)
+
+ if args.config:
+ config = Config(app, args.config)
+ # apply settings
+ for setting in config.settings:
+ setattr(args, config.settings[setting]['mapping'], config.property(setting))
+
+ split_check = (
+ (args.proxy, 'proxy'),
+ )
+ for arg, name in split_check:
+ if arg:
+ item = arg.split(':')
+ if len(item) < 2 or not len(item[1]):
+ p.print_help()
+ sys.exit(1)
+ setattr(args, name, item)
+
+ if args.proxy is not None:
+ if args.proxy_type == 'socks5':
+ args.proxy_type = QNetworkProxy.Socks5Proxy
+
+ do_action('ParseArgs', args)
+
+ if args.debug:
+ debug(args.debug)
+
+ # verbose flag got changed on us, so we reload the flag
+ if messageHandler.verbose != args.verbose:
+ messageHandler.verbose = args.verbose
+
+ if args.script is None:
+ p.print_help()
+ sys.exit(1)
+
+ if not os.path.exists(args.script):
+ sys.exit("No such file or directory: '%s'" % args.script)
+
+ return args
+
+
+class Config(QObject):
+ def __init__(self, parent, jsonFile):
+ super(Config, self).__init__(parent)
+
+ with codecs.open(jsonFile, encoding='utf-8') as f:
+ json = f.read()
+
+ self.settings = {
+ 'cookiesFile': { 'mapping': 'cookies_file', 'default': defaults['cookiesFile'] },
+ 'debug': { 'mapping': 'debug', 'default': defaults['debug'] },
+ 'diskCache': { 'mapping': 'disk_cache', 'default': defaults['diskCache'] },
+ 'ignoreSslErrors': { 'mapping': 'ignore_ssl_errors', 'default': defaults['ignoreSslErrors'] },
+ 'loadImages': { 'mapping': 'load_images', 'default': defaults['loadImages'] },
+ 'loadPlugins': { 'mapping': 'load_plugins', 'default': defaults['loadPlugins'] },
+ 'localToRemoteUrlAccessEnabled': { 'mapping': 'local_to_remote_url_access', 'default': defaults['localToRemoteUrlAccessEnabled'] },
+ 'maxDiskCacheSize': { 'mapping': 'max_disk_cache_size', 'default': defaults['maxDiskCacheSize'] },
+ 'outputEncoding': { 'mapping': 'output_encoding', 'default': defaults['outputEncoding'] },
+ 'proxy': { 'mapping': 'proxy', 'default': defaults['proxy'] },
+ 'proxyType': { 'mapping': 'proxy_type', 'default': defaults['proxyType'] },
+ 'scriptEncoding': { 'mapping': 'script_encoding', 'default': defaults['scriptEncoding'] },
+ 'verbose': { 'mapping': 'verbose', 'default': defaults['verbose'] }
+ }
+
+ do_action('ConfigInit', self.settings)
+
+ # generate dynamic properties
+ for setting in self.settings:
+ self.setProperty(setting, self.settings[setting]['default'])
+
+ # now it's time to parse our JSON file
+ if not json.lstrip().startswith('{') or not json.rstrip().endswith('}'):
+ qWarning('Config file MUST be in JSON format!')
+ return
+
+ webPage = QWebPage(self)
+
+ with QPyFile(':/configurator.js') as f:
+ # add config object
+ webPage.mainFrame().addToJavaScriptWindowObject('config', self)
+ # apply settings
+ webPage.mainFrame().evaluateJavaScript(f.readAll().replace('%1', json))
+
+ do_action('Config')
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/bootstrap.js phantomjs-1.4.0+dfsg/python/pyphantomjs/bootstrap.js
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/bootstrap.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/bootstrap.js 2011-12-27 13:46:57.000000000 +0000
@@ -37,7 +37,7 @@
var code, func, exports;
- if (name === 'webpage' || name === 'fs') {
+ if (name === 'webpage' || name === 'fs' || name == 'webserver') {
code = phantom.loadModuleSource(name);
func = new Function("exports", "window", code);
exports = {};
@@ -55,3 +55,4 @@
// Legacy way to use WebPage
window.WebPage = require('webpage').create;
+window.WebServer = require('webserver').create;
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/config.py phantomjs-1.4.0+dfsg/python/pyphantomjs/config.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/config.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/config.py 1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-'''
- This file is part of the PyPhantomJS project.
-
- Copyright (C) 2011 James Roe
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
-'''
-
-import codecs
-import sys
-
-from PyQt4.QtCore import QObject, qWarning
-from PyQt4.QtWebKit import QWebPage
-
-from plugincontroller import do_action
-from utils import QPyFile
-
-
-class Config(QObject):
- def __init__(self, parent, jsonFile):
- super(Config, self).__init__(parent)
-
- with codecs.open(jsonFile, encoding='utf-8') as fd:
- json = fd.read()
-
- self.settings = {
- 'cookiesFile': { 'mapping': 'cookies_file', 'default': None },
- 'debug': { 'mapping': 'debug', 'default': None },
- 'diskCache': { 'mapping': 'disk_cache', 'default': False },
- 'ignoreSslErrors': { 'mapping': 'ignore_ssl_errors', 'default': False },
- 'loadImages': { 'mapping': 'load_images', 'default': True },
- 'loadPlugins': { 'mapping': 'load_plugins', 'default': False },
- 'localToRemoteUrlAccessEnabled': { 'mapping': 'local_to_remote_url_access', 'default': False },
- 'maxDiskCacheSize': { 'mapping': 'max_disk_cache_size', 'default': -1 },
- 'outputEncoding': { 'mapping': 'output_encoding', 'default': 'System' },
- 'proxy': { 'mapping': 'proxy', 'default': None },
- 'scriptEncoding': { 'mapping': 'script_encoding', 'default': 'utf-8' },
- 'verbose': { 'mapping': 'verbose', 'default': False }
- }
-
- do_action('ConfigInit', self.settings)
-
- # generate dynamic properties
- for setting in self.settings:
- self.setProperty(setting, self.settings[setting]['default'])
-
- # now it's time to parse our JSON file
- if not json.lstrip().startswith('{') or not json.rstrip().endswith('}'):
- qWarning('Config file MUST be in JSON format!')
- return
-
- with QPyFile(':/configurator.js') as f:
- configurator = f.readAll()
-
- webPage = QWebPage(self)
-
- # add config object
- webPage.mainFrame().addToJavaScriptWindowObject('config', self)
- # apply settings
- webPage.mainFrame().evaluateJavaScript(configurator.replace('%1', json))
-
- do_action('Config')
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/cookiejar.py phantomjs-1.4.0+dfsg/python/pyphantomjs/cookiejar.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/cookiejar.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/cookiejar.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,11 +10,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
from PyQt4.QtCore import QSettings
@@ -33,7 +33,7 @@
settings.beginGroup(url.host())
for cookie in cookieList:
- settings.setValue(cookie.name(), cookie.value())
+ settings.setValue(str(cookie.name()), str(cookie.value()))
settings.sync()
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/csconverter.py phantomjs-1.4.0+dfsg/python/pyphantomjs/csconverter.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/csconverter.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/csconverter.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,15 +10,13 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
-import sys
-
from PyQt4.QtCore import QObject
from PyQt4.QtGui import QApplication
from PyQt4.QtWebKit import QWebPage
@@ -39,10 +37,8 @@
self.m_webPage = QWebPage(self)
with QPyFile(':/resources/coffee-script.js') as f:
- script = f.readAll()
-
- self.m_webPage.mainFrame().evaluateJavaScript(script)
- self.m_webPage.mainFrame().addToJavaScriptWindowObject('converter', self)
+ self.m_webPage.mainFrame().evaluateJavaScript(f.readAll())
+ self.m_webPage.mainFrame().addToJavaScriptWindowObject('converter', self)
def convert(self, script):
self.setProperty('source', script)
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/encoding.py phantomjs-1.4.0+dfsg/python/pyphantomjs/encoding.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/encoding.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/encoding.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,11 +10,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
import codecs
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/filesystem.py phantomjs-1.4.0+dfsg/python/pyphantomjs/filesystem.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/filesystem.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/filesystem.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,11 +10,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
import codecs
@@ -130,7 +130,7 @@
def _size(self, path):
try:
return os.path.getsize(path)
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.size - %s: '%s'" % (e, path))
return -1
@@ -154,7 +154,7 @@
try:
shutil.copy2(source, target)
return True
- except IOError as (t, e):
+ except IOError as (_, e):
qDebug("FileSystem.copy - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -163,7 +163,7 @@
try:
os.rename(source, target)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.rename - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -176,7 +176,7 @@
try:
shutil.copytree(source, target)
return True
- except IOError as (t, e):
+ except IOError as (_, e):
qDebug("FileSystem.copyTree - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -203,7 +203,7 @@
try:
shutil.copytree(source, target, True)
return True
- except IOError as (t, e):
+ except IOError as (_, e):
qDebug("FileSystem.copyLinkTree - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -234,7 +234,7 @@
try:
f = codecs.open(path, mode, encoding='utf-8')
return File(self, f)
- except (IOError, ValueError) as (t, e):
+ except (IOError, ValueError) as (_, e):
qDebug("FileSystem.open - %s: '%s'" % (e, path))
return
@@ -269,11 +269,11 @@
def listTree(self, path):
try:
listing = []
- for root, dirs, files in os.walk(path):
+ for root, _, files in os.walk(path):
for file_ in files:
listing.append(os.path.join(root, file_))
return listing
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.listTree - %s: '%s'" % (e, path))
return
@@ -281,11 +281,11 @@
def listDirectoryTree(self, path):
try:
listing = []
- for root, dirs, files in os.walk(path):
+ for root, dirs, _ in os.walk(path):
for dir_ in dirs:
listing.append(os.path.join(root, dir_))
return listing
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.listDirectoryTree - %s: '%s'" % (e, path))
return
@@ -298,7 +298,7 @@
try:
os.symlink(source, target)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.symbolicLink - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -307,7 +307,7 @@
try:
os.link(source, target)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.hardLink - %s: '%s' -> '%s'" % (e, source, target))
return False
@@ -315,7 +315,7 @@
def readLink(self, path):
try:
return os.readlink(path)
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.readLink - %s: '%s'" % (e, path))
return ''
@@ -407,8 +407,8 @@
else:
os.chown(path, -1, getgrnam(group).gr_gid)
return True
- except OSError as (t, e):
- qDebug("FileSystem.changeGroup - %s: '%s':'%s'" % (e, owner, path))
+ except OSError as (_, e):
+ qDebug("FileSystem.changeGroup - %s: '%s':'%s'" % (e, group, path))
except KeyError as e:
qDebug("FileSystem.changeGroup - %s: '%s'" % (e.args[0], path))
return False
@@ -422,8 +422,8 @@
else:
os.lchown(path, -1, getgrnam(group).gr_gid)
return True
- except OSError as (t, e):
- qDebug("FileSystem.changeLinkGroup - %s: '%s':'%s'" % (e, owner, path))
+ except OSError as (_, e):
+ qDebug("FileSystem.changeLinkGroup - %s: '%s':'%s'" % (e, group, path))
except KeyError as e:
qDebug("FileSystem.changeLinkGroup - %s: '%s'" % (e.args[0], path))
return False
@@ -437,50 +437,12 @@
else:
os.lchown(path, getpwnam(owner).pw_uid, -1)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.changeLinkOwner - %s: '%s':'%s'" % (e, owner, path))
except KeyError as e:
qDebug("FileSystem.changeLinkOwner - %s: '%s'" % (e.args[0], path))
return False
- @pyqtSlot(str, int, result=bool)
- @pyqtSlot(str, 'QVariantMap', result=bool)
- def changeLinkPermissions(self, path, permissions):
- # permissions uses an object in 4 types: owner, group, others, special
- # owner,group,others each has 3 types, read,write,executable, contained in an array
- # special uses setuid,setgid,sticky
- #
- # In order to turn values on or off, just use true or false values.
- #
- # Permissions can alternatively be a numeric mode to chmod too.
-
- keys = {
- 'owner': {'read': 'S_IRUSR', 'write': 'S_IWUSR', 'executable': 'S_IXUSR'},
- 'group': {'read': 'S_IRGRP', 'write': 'S_IWGRP', 'executable': 'S_IXGRP'},
- 'others': {'read': 'S_IROTH', 'write': 'S_IWOTH', 'executable': 'S_IXOTH'},
- 'special': {'setuid': 'S_ISUID', 'setgid': 'S_ISGID', 'sticky': 'S_ISVTX'}
- }
-
- try:
- if isinstance(permissions, int):
- os.lchmod(path, permissions)
- else:
- bitnum = os.lstat(path).st_mode
- for section in permissions:
- for key in permissions[section]:
- try:
- if permissions[section][key] is True:
- bitnum = bitnum | stat.__dict__[keys[section][key]]
- elif permissions[section][key] is False:
- bitnum = bitnum & ~stat.__dict__[keys[section][key]]
- except KeyError:
- pass
- os.lchmod(path, bitnum)
- return True
- except OSError as (t, e):
- qDebug("FileSystem.changeLinkPermissions - %s: '%s'" % (e, path))
- return False
-
@pyqtSlot(str, str, result=bool)
@pyqtSlot(str, int, result=bool)
def changeOwner(self, path, owner):
@@ -490,7 +452,7 @@
else:
os.chown(path, getpwnam(owner).pw_uid, -1)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.changeOwner - %s: '%s':'%s'" % (e, owner, path))
except KeyError as e:
qDebug("FileSystem.changeOwner - %s: '%s'" % (e.args[0], path))
@@ -530,7 +492,7 @@
pass
os.chmod(path, bitnum)
return True
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.changePermissions - %s: '%s'" % (e, path))
return False
@@ -542,7 +504,7 @@
'name': getgrgid(finfo.st_gid).gr_name,
'uid': finfo.st_gid
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.group - %s: '%s'" % (e, path))
return
@@ -554,7 +516,7 @@
'name': getpwuid(finfo.st_uid).pw_name,
'uid': finfo.st_uid
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.owner - %s: '%s'" % (e, path))
return
@@ -566,7 +528,7 @@
'name': getgrgid(finfo.st_gid).gr_name,
'uid': finfo.st_gid
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.linkGroup - %s: '%s'" % (e, path))
return
@@ -578,7 +540,7 @@
'name': getpwuid(finfo.st_uid).pw_name,
'uid': finfo.st_uid
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.linkOwner - %s: '%s'" % (e, path))
return
@@ -616,7 +578,7 @@
'others': {'read': isOthRd, 'write': isOthWr, 'executable': isOthEx},
'special': {'setuid': isSUid, 'setgid': isSGid, 'sticky': isStick}
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.linkPermissions - %s: '%s'" % (e, path))
return
@@ -654,7 +616,7 @@
'others': {'read': isOthRd, 'write': isOthWr, 'executable': isOthEx},
'special': {'setuid': isSUid, 'setgid': isSGid, 'sticky': isStick}
}
- except OSError as (t, e):
+ except OSError as (_, e):
qDebug("FileSystem.permissions - %s: '%s'" % (e, path))
return
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/filesystem-shim.js phantomjs-1.4.0+dfsg/python/pyphantomjs/filesystem-shim.js
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/filesystem-shim.js 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/filesystem-shim.js 1970-01-01 00:00:00.000000000 +0000
@@ -1,163 +0,0 @@
-/*jslint sloppy: true, nomen: true */
-/*global window:true,phantom:true,fs:true */
-
-/*
- This file is part of the PhantomJS project from Ofi Labs.
-
- Copyright (C) 2011 Ivan De Marino
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-// window.fs
-// JavaScript "shim" to throw exceptions in case a critical operation fails.
-
-/** Open and return a "file" object.
- * It will throw exception if it fails.
- *
- * @param path Path of the file to open
- * @param mode Open Mode. A string made of 'r', 'w', 'a/+' characters.
- * @return "file" object
- */
-window.fs.open = function (path, mode) {
- var file = window.fs._open(path, mode);
- if (file) {
- return file;
- }
- throw "Unable to open file '" + path + "'";
-};
-
-/** Open, read and return content of a file.
- * It will throw an exception if it fails.
- *
- * @param path Path of the file to read from
- * @return file content
- */
-window.fs.read = function (path) {
- var f = fs.open(path, 'r'),
- content = f.read();
-
- f.close();
- return content;
-};
-
-/** Open and write content to a file
- * It will throw an exception if it fails.
- *
- * @param path Path of the file to read from
- * @param content Content to write to the file
- * @param mode Open Mode. A string made of 'w' or 'a / +' characters.
- */
-window.fs.write = function (path, content, mode) {
- var f = fs.open(path, mode);
-
- f.write(content);
- f.close();
-};
-
-/** Return the size of a file, in bytes.
- * It will throw an exception if it fails.
- *
- * @param path Path of the file to read the size of
- * @return File size in bytes
- */
-window.fs.size = function (path) {
- var size = fs._size(path);
- if (size !== -1) {
- return size;
- }
- throw "Unable to read file '" + path + "' size";
-};
-
-/** Copy a file.
- * It will throw an exception if it fails.
- *
- * @param source Path of the source file
- * @param destination Path of the destination file
- */
-window.fs.copy = function (source, destination) {
- if (!fs._copy(source, destination)) {
- throw "Unable to copy file '" + source + "' at '" + destination + "'";
- }
-};
-
-/** Copy a directory tree.
- * It will throw an exception if it fails.
- *
- * @param source Path of the source directory tree
- * @param destination Path of the destination directory tree
- */
-window.fs.copyTree = function (source, destination) {
- if (!fs._copyTree(source, destination)) {
- throw "Unable to copy directory tree '" + source + "' at '" + destination + "'";
- }
-};
-
-/** Move a file.
- * It will throw an exception if it fails.
- *
- * @param source Path of the source file
- * @param destination Path of the destination file
- */
-window.fs.move = function (source, destination) {
- fs.copy(source, destination);
- fs.remove(source);
-};
-
-/** Removes a file.
- * It will throw an exception if it fails.
- *
- * @param path Path of the file to remove
- */
-window.fs.remove = function (path) {
- if (!fs._remove(path)) {
- throw "Unable to remove file '" + path + "'";
- }
-};
-
-/** Removes a directory.
- * It will throw an exception if it fails.
- *
- * @param path Path of the directory to remove
- */
-window.fs.removeDirectory = function (path) {
- if (!fs._removeDirectory(path)) {
- throw "Unable to remove directory '" + path + "'";
- }
-};
-
-/** Removes a directory tree.
- * It will throw an exception if it fails.
- *
- * @param path Path of the directory tree to remove
- */
-window.fs.removeTree = function (path) {
- if (!fs._removeTree(path)) {
- throw "Unable to remove directory tree '" + path + "'";
- }
-};
-
-window.fs.touch = function (path) {
- fs.write(path, "", 'a');
-};
\ No newline at end of file
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/__init__.py phantomjs-1.4.0+dfsg/python/pyphantomjs/__init__.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/__init__.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/__init__.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,13 +10,13 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
-__version_info__ = (1, 3, 0)
+__version_info__ = (1, 4, 0)
__version__ = '.'.join(map(str, __version_info__))
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/modules/webserver.js phantomjs-1.4.0+dfsg/python/pyphantomjs/modules/webserver.js
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/modules/webserver.js 1970-01-01 00:00:00.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/modules/webserver.js 2011-12-27 13:46:57.000000000 +0000
@@ -0,0 +1,130 @@
+/*jslint sloppy: true, nomen: true */
+/*global exports:true,phantom:true */
+
+/*
+ This file is part of the PhantomJS project from Ofi Labs.
+
+ Copyright (C) 2011 Ariya Hidayat
+ Copyright (C) 2011 Ivan De Marino
+ Copyright (C) 2011 James Roe
+ Copyright (C) 2011 execjosh, http://execjosh.blogspot.com
+ Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com
+ Author: Milian Wolff
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ * Neither the name of the nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+exports.create = function (opts) {
+ var server = phantom.createWebServer();
+ var handlers = {};
+
+ function checkType(o, type) {
+ return typeof o === type;
+ }
+
+ function isObject(o) {
+ return checkType(o, 'object');
+ }
+
+ function isUndefined(o) {
+ return checkType(o, 'undefined');
+ }
+
+ function isUndefinedOrNull(o) {
+ return isUndefined(o) || null === o;
+ }
+
+ function copyInto(target, source) {
+ if (target === source || isUndefinedOrNull(source)) {
+ return target;
+ }
+
+ target = target || {};
+
+ // Copy into objects only
+ if (isObject(target)) {
+ // Make sure source exists
+ source = source || {};
+
+ if (isObject(source)) {
+ var i, newTarget, newSource;
+ for (i in source) {
+ if (source.hasOwnProperty(i)) {
+ newTarget = target[i];
+ newSource = source[i];
+
+ if (newTarget && isObject(newSource)) {
+ // Deep copy
+ newTarget = copyInto(target[i], newSource);
+ } else {
+ newTarget = newSource;
+ }
+
+ if (!isUndefined(newTarget)) {
+ target[i] = newTarget;
+ }
+ }
+ }
+ } else {
+ target = source;
+ }
+ }
+
+ return target;
+ }
+
+ function defineSetter(handlerName, signalName) {
+ server.__defineSetter__(handlerName, function (f) {
+ if (handlers && typeof handlers[signalName] === 'function') {
+ try {
+ this[signalName].disconnect(handlers[signalName]);
+ } catch (e) {}
+ }
+ handlers[signalName] = f;
+ this[signalName].connect(handlers[signalName]);
+ });
+ }
+
+ // deep copy
+ //TODO: use this?
+// server.settings = JSON.parse(JSON.stringify(phantom.defaultServerSettings));
+
+ defineSetter("onNewRequest", "newRequest");
+
+ server.listen = function (port, handler) {
+ if (arguments.length === 2 && typeof handler === 'function') {
+ this.onNewRequest = handler;
+ //TODO: settings?
+ return this.listenOnPort(port);
+ }
+ throw "Wrong use of WebServer#listen";
+ };
+
+ // Copy options into server
+ if (opts) {
+ server = copyInto(server, opts);
+ }
+
+ return server;
+};
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/networkaccessmanager.py phantomjs-1.4.0+dfsg/python/pyphantomjs/networkaccessmanager.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/networkaccessmanager.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/networkaccessmanager.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,11 +10,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
from PyQt4.QtCore import pyqtSignal, QDateTime
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/phantom.py phantomjs-1.4.0+dfsg/python/pyphantomjs/phantom.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/phantom.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/phantom.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,17 +10,16 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
import os
import sys
-import sip
from PyQt4.QtCore import pyqtProperty, pyqtSlot, QObject
from PyQt4.QtGui import QApplication
from PyQt4.QtNetwork import QNetworkProxy, QNetworkProxyFactory
@@ -29,8 +28,9 @@
from encoding import Encode
from filesystem import FileSystem
from plugincontroller import do_action
-from utils import injectJsInFrame, QPyFile
-from webpage import WebPage
+from utils import QPyFile
+from webpage import injectJsInFrame, WebPage
+from webserver import WebServer
class Phantom(QObject):
@@ -40,6 +40,7 @@
# variable declarations
self.m_defaultPageSettings = {}
self.m_pages = []
+ self.m_servers = []
self.m_verbose = args.verbose
self.m_page = WebPage(self, args)
self.m_returnValue = 0
@@ -58,7 +59,7 @@
if args.proxy is None:
QNetworkProxyFactory.setUseSystemConfiguration(True)
else:
- proxy = QNetworkProxy(QNetworkProxy.HttpProxy, args.proxy[0], int(args.proxy[1]))
+ proxy = QNetworkProxy(args.proxy_type, args.proxy[0], int(args.proxy[1]))
QNetworkProxy.setApplicationProxy(proxy)
self.m_page.javaScriptConsoleMessageSent.connect(self.printConsoleMessage)
@@ -77,8 +78,7 @@
self.m_page.mainFrame().addToJavaScriptWindowObject('phantom', self)
with QPyFile(':/bootstrap.js') as f:
- bootstrap = f.readAll()
- self.m_page.mainFrame().evaluateJavaScript(bootstrap)
+ self.m_page.mainFrame().evaluateJavaScript(f.readAll())
do_action('PhantomInitPost')
@@ -114,6 +114,15 @@
page.libraryPath = os.path.dirname(os.path.abspath(self.m_scriptFile))
return page
+ @pyqtSlot(result=WebServer)
+ def createWebServer(self):
+ server = WebServer(self)
+ self.m_servers.append(server)
+ # :TODO:
+ # page.applySettings(self.m_defaultPageSettings)
+ # page.libraryPath = os.path.dirname(os.path.abspath(self.m_scriptFile)
+ return server
+
@pyqtProperty('QVariantMap')
def defaultPageSettings(self):
return self.m_defaultPageSettings
@@ -125,13 +134,17 @@
self.m_returnValue = code
# stop javascript execution in start script;
- # delete all the pages C++ objects, then clear
+ # release all pages, then clear
# the page list, and empty the Phantom page
for page in self.m_pages:
- sip.delete(page)
+ page.release()
del self.m_pages[:]
self.m_page = None
+ for server in self.m_servers:
+ server.release()
+ del self.m_servers[:] # not needed, but I'd rather be thorough
+
QApplication.instance().exit(code)
@pyqtSlot(str, result=bool)
@@ -143,9 +156,7 @@
moduleSourceFilePath = ':/modules/%s.js' % name
with QPyFile(moduleSourceFilePath) as f:
- moduleSource = f.readAll()
-
- return moduleSource
+ return f.readAll()
@pyqtProperty(str)
def libraryPath(self):
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/plugincontroller.py phantomjs-1.4.0+dfsg/python/pyphantomjs/plugincontroller.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/plugincontroller.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/plugincontroller.py 2011-12-27 13:46:57.000000000 +0000
@@ -10,11 +10,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
import os
@@ -26,22 +26,26 @@
hooks = defaultdict(dict)
-def _checkHookExists(create=False):
- '''Decorator that will raise LookupError or create hook if hook doesn't exist'''
- def outterWrap(func):
- def innerWrap(*args, **kwargs):
- if args[0] not in hooks:
- if create:
- hooks[args[0]]['count'] = 0
- hooks[args[0]]['plugins'] = []
- else:
- raise LookupError("Hook '%s' was not found" % args[0])
- return func(*args, **kwargs)
- return innerWrap
- return outterWrap
+def createHook(func):
+ '''Decorator that will create a hook if the hook doesn't exist'''
+ def innerWrap(*args, **kwargs):
+ if args[0] not in hooks:
+ hooks[args[0]]['count'] = 0
+ hooks[args[0]]['plugins'] = []
+ return func(*args, **kwargs)
+ return innerWrap
+
+
+def checkHookExists(func):
+ '''Decorator that will raise LookupError if the hook doesn't exist'''
+ def innerWrap(*args, **kwargs):
+ if args[0] not in hooks:
+ raise LookupError("Hook '%s' was not found" % args[0])
+ return func(*args, **kwargs)
+ return innerWrap
-@_checkHookExists(True)
+@createHook
def add_action(hook, priority=10):
'''Decorator to be used for registering a function to
a specific hook. Functions with lower priority are
@@ -53,13 +57,13 @@
return register
-@_checkHookExists()
+@checkHookExists
def did_action(hook):
'''Find out how many times a hook was fired'''
return hooks[hook]['count']
-@_checkHookExists(True)
+@createHook
def do_action(hook, *args, **kwargs):
'''Trigger a hook. It will run any functions that have registered
themselves to the hook. Any additional arguments or keyword
@@ -101,7 +105,7 @@
raise LookupError("Hook '%s' was not found" % hook)
for plugin in hooks[hook]['plugins']:
- if plugin[1] == func:
+ if plugin[1] is func:
return True
return False
@@ -120,13 +124,13 @@
raise LookupError("Hook '%s' was not found" % hook)
for i, plugin in enumerate(hooks[hook]['plugins']):
- if plugin[1] == func and plugin[0] == priority:
+ if plugin[1] is func and plugin[0] == priority:
del hooks[hook]['plugins'][i]
return True
return False
-@_checkHookExists()
+@checkHookExists
def remove_all_actions(hook, priority=None):
'''Remove all functions that have been registered to hook.
If priority is used, remove all actions from that priority
@@ -174,20 +178,18 @@
if plugins_path is None:
# path is different when frozen
if hasattr(sys, 'frozen'):
- path = os.path.dirname(os.path.abspath(sys.executable))
+ plugins_path = os.path.dirname(os.path.abspath(sys.executable))
else:
- path = os.path.dirname(os.path.abspath(__file__))
+ plugins_path = os.path.dirname(os.path.abspath(__file__))
- generateModuleName = lambda p: '.'.join(('plugins', p[0], p[1]))
- plugin_list = glob(os.path.join(path, 'plugins/*/*.py'))
+ plugins_path = os.path.join(plugins_path, 'plugins')
else:
# make sure it's an absolute path
plugins_path = os.path.abspath(plugins_path)
- # append directory for module loading
- sys.path[1:1] = plugins_path,
- generateModuleName = lambda p: '.'.join((p[0], p[1]))
- plugin_list = glob(os.path.join(plugins_path, '*/*.py'))
+ sys.path.insert(1, plugins_path)
+
+ plugin_list = glob(os.path.join(plugins_path, '*/*.py'))
# now convert list to [('plugin_folder', 'file'), ...]
plugin_list = [(os.path.split(os.path.dirname(f))[1], os.path.splitext(os.path.split(f)[1])[0]) for f in plugin_list]
@@ -195,5 +197,5 @@
# initialize plugins
for plugin in plugin_list:
if plugin[0] == plugin[1]:
- moduleName = generateModuleName(plugin)
+ moduleName = '.'.join((plugin[0], plugin[1]))
__import__(moduleName, globals(), locals(), [], -1)
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/pyphantomjs.py phantomjs-1.4.0+dfsg/python/pyphantomjs/pyphantomjs.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/pyphantomjs.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/pyphantomjs.py 2011-12-27 13:46:57.000000000 +0000
@@ -11,11 +11,11 @@
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ along with this program. If not, see .
'''
# automatically convert Qt types by using api 2
@@ -24,10 +24,8 @@
'QUrl', 'QVariant'):
sip.setapi(item, 2)
-import os
import sys
-from PyQt4.QtCore import qInstallMsgHandler
from PyQt4.QtGui import QApplication, QIcon
from plugincontroller import do_action
@@ -38,9 +36,8 @@
import resources
from __init__ import __version__
-from config import Config
+from arguments import parseArgs
from phantom import Phantom
-from utils import argParser, MessageHandler
# make keyboard interrupt quit program
import signal
@@ -52,83 +49,8 @@
sys.stderr = SafeStreamFilter(sys.stderr)
-def debug(debug_type):
- def excepthook(type_, value, tb):
- import traceback
-
- # print the exception...
- traceback.print_exception(type_, value, tb)
- print
- # ...then start the debugger in post-mortem mode
- pdb.pm()
-
- # we are NOT in interactive mode
- if not hasattr(sys, 'ps1') or sys.stderr.target.isatty():
- import pdb
-
- from PyQt4.QtCore import pyqtRemoveInputHook
- pyqtRemoveInputHook()
-
- if debug_type == 'exception':
- sys.excepthook = excepthook
- elif debug_type == 'program':
- pdb.set_trace()
-
-
-def parseArgs(app, args):
- # Handle all command-line options
- p = argParser()
- arg_data = p.parse_known_args(args)
- args = arg_data[0]
- args.script_args = arg_data[1]
-
- # register an alternative Message Handler
- messageHandler = MessageHandler(args.verbose)
- qInstallMsgHandler(messageHandler.process)
-
- file_check = (args.cookies_file, args.config)
- for file_ in file_check:
- if file_ is not None and not os.path.exists(file_):
- sys.exit("No such file or directory: '%s'" % file_)
-
- if args.config:
- config = Config(app, args.config)
- # apply settings
- for setting in config.settings:
- setattr(args, config.settings[setting]['mapping'], config.property(setting))
-
- split_check = (
- (args.proxy, 'proxy'),
- )
- for arg, name in split_check:
- if arg:
- item = arg.split(':')
- if len(item) < 2 or not len(item[1]):
- p.print_help()
- sys.exit(1)
- setattr(args, name, item)
-
- do_action('ParseArgs', args)
-
- if args.debug:
- debug(args.debug)
-
- # verbose flag got changed on us, so we reload the flag
- if messageHandler.verbose != args.verbose:
- messageHandler.verbose = args.verbose
-
- if args.script is None:
- p.print_help()
- sys.exit(1)
-
- if not os.path.exists(args.script):
- sys.exit("No such file or directory: '%s'" % args.script)
-
- return args
-
-
-def main():
- app = QApplication(sys.argv)
+def main(arguments):
+ app = QApplication([sys.argv[0]] + arguments)
app.setWindowIcon(QIcon(':/resources/pyphantomjs-icon.png'))
app.setApplicationName('PyPhantomJS')
@@ -136,7 +58,7 @@
app.setOrganizationDomain('www.umaclan.com')
app.setApplicationVersion(__version__)
- args = parseArgs(app, sys.argv[1:])
+ args = parseArgs(app, arguments)
phantom = Phantom(app, args)
@@ -151,4 +73,4 @@
if __name__ == '__main__':
- sys.exit(main())
+ sys.exit(main(sys.argv[1:]))
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/resources.py phantomjs-1.4.0+dfsg/python/pyphantomjs/resources.py
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/resources.py 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/resources.py 2011-12-27 13:46:57.000000000 +0000
@@ -2,15 +2,15 @@
# Resource object code
#
-# Created: Tue Sep 13 14:48:39 2011
-# by: The Resource Compiler for PyQt (Qt v4.7.2)
+# Created: Fri Dec 2 16:03:48 2011
+# by: The Resource Compiler for PyQt (Qt v4.7.3)
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore
qt_resource_data = "\
-\x00\x00\x09\x75\
+\x00\x00\x09\xbc\
\x2f\
\x2a\x6a\x73\x6c\x69\x6e\x74\x20\x73\x6c\x6f\x70\x70\x79\x3a\x20\
\x74\x72\x75\x65\x2c\x20\x6e\x6f\x6d\x65\x6e\x3a\x20\x74\x72\x75\
@@ -134,36 +134,40 @@
\x74\x73\x3b\x0a\x0a\x20\x20\x20\x20\x69\x66\x20\x28\x6e\x61\x6d\
\x65\x20\x3d\x3d\x3d\x20\x27\x77\x65\x62\x70\x61\x67\x65\x27\x20\
\x7c\x7c\x20\x6e\x61\x6d\x65\x20\x3d\x3d\x3d\x20\x27\x66\x73\x27\
-\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x63\x6f\x64\x65\
-\x20\x3d\x20\x70\x68\x61\x6e\x74\x6f\x6d\x2e\x6c\x6f\x61\x64\x4d\
-\x6f\x64\x75\x6c\x65\x53\x6f\x75\x72\x63\x65\x28\x6e\x61\x6d\x65\
-\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x66\x75\x6e\x63\x20\
-\x3d\x20\x6e\x65\x77\x20\x46\x75\x6e\x63\x74\x69\x6f\x6e\x28\x22\
-\x65\x78\x70\x6f\x72\x74\x73\x22\x2c\x20\x22\x77\x69\x6e\x64\x6f\
-\x77\x22\x2c\x20\x63\x6f\x64\x65\x29\x3b\x0a\x20\x20\x20\x20\x20\
-\x20\x20\x20\x65\x78\x70\x6f\x72\x74\x73\x20\x3d\x20\x7b\x7d\x3b\
-\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\x6e\x61\x6d\
-\x65\x20\x3d\x3d\x3d\x20\x27\x66\x73\x27\x29\x20\x7b\x0a\x20\x20\
-\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x65\x78\x70\x6f\x72\x74\
-\x73\x20\x3d\x20\x70\x68\x61\x6e\x74\x6f\x6d\x2e\x63\x72\x65\x61\
-\x74\x65\x46\x69\x6c\x65\x73\x79\x73\x74\x65\x6d\x28\x29\x3b\x0a\
-\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\x20\
-\x20\x20\x66\x75\x6e\x63\x2e\x63\x61\x6c\x6c\x28\x7b\x7d\x2c\x20\
-\x65\x78\x70\x6f\x72\x74\x73\x2c\x20\x7b\x7d\x29\x3b\x0a\x20\x20\
-\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x65\x78\x70\
-\x6f\x72\x74\x73\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x0a\x20\x20\x20\
-\x20\x69\x66\x20\x28\x74\x79\x70\x65\x6f\x66\x20\x65\x78\x70\x6f\
-\x72\x74\x73\x20\x3d\x3d\x3d\x20\x27\x75\x6e\x64\x65\x66\x69\x6e\
-\x65\x64\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x74\
-\x68\x72\x6f\x77\x20\x27\x55\x6e\x6b\x6e\x6f\x77\x6e\x20\x6d\x6f\
-\x64\x75\x6c\x65\x20\x27\x20\x2b\x20\x6e\x61\x6d\x65\x20\x2b\x20\
-\x27\x20\x66\x6f\x72\x20\x72\x65\x71\x75\x69\x72\x65\x28\x29\x27\
-\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x7d\x0a\x0a\x2f\x2f\x20\x4c\x65\
-\x67\x61\x63\x79\x20\x77\x61\x79\x20\x74\x6f\x20\x75\x73\x65\x20\
-\x57\x65\x62\x50\x61\x67\x65\x0a\x77\x69\x6e\x64\x6f\x77\x2e\x57\
-\x65\x62\x50\x61\x67\x65\x20\x3d\x20\x72\x65\x71\x75\x69\x72\x65\
-\x28\x27\x77\x65\x62\x70\x61\x67\x65\x27\x29\x2e\x63\x72\x65\x61\
-\x74\x65\x3b\x0a\
+\x20\x7c\x7c\x20\x6e\x61\x6d\x65\x20\x3d\x3d\x20\x27\x77\x65\x62\
+\x73\x65\x72\x76\x65\x72\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\
+\x20\x20\x20\x63\x6f\x64\x65\x20\x3d\x20\x70\x68\x61\x6e\x74\x6f\
+\x6d\x2e\x6c\x6f\x61\x64\x4d\x6f\x64\x75\x6c\x65\x53\x6f\x75\x72\
+\x63\x65\x28\x6e\x61\x6d\x65\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x66\x75\x6e\x63\x20\x3d\x20\x6e\x65\x77\x20\x46\x75\x6e\
+\x63\x74\x69\x6f\x6e\x28\x22\x65\x78\x70\x6f\x72\x74\x73\x22\x2c\
+\x20\x22\x77\x69\x6e\x64\x6f\x77\x22\x2c\x20\x63\x6f\x64\x65\x29\
+\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x65\x78\x70\x6f\x72\x74\
+\x73\x20\x3d\x20\x7b\x7d\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x69\x66\x20\x28\x6e\x61\x6d\x65\x20\x3d\x3d\x3d\x20\x27\x66\x73\
+\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x65\x78\x70\x6f\x72\x74\x73\x20\x3d\x20\x70\x68\x61\x6e\x74\
+\x6f\x6d\x2e\x63\x72\x65\x61\x74\x65\x46\x69\x6c\x65\x73\x79\x73\
+\x74\x65\x6d\x28\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x66\x75\x6e\x63\x2e\x63\x61\
+\x6c\x6c\x28\x7b\x7d\x2c\x20\x65\x78\x70\x6f\x72\x74\x73\x2c\x20\
+\x7b\x7d\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\
+\x75\x72\x6e\x20\x65\x78\x70\x6f\x72\x74\x73\x3b\x0a\x20\x20\x20\
+\x20\x7d\x0a\x0a\x20\x20\x20\x20\x69\x66\x20\x28\x74\x79\x70\x65\
+\x6f\x66\x20\x65\x78\x70\x6f\x72\x74\x73\x20\x3d\x3d\x3d\x20\x27\
+\x75\x6e\x64\x65\x66\x69\x6e\x65\x64\x27\x29\x20\x7b\x0a\x20\x20\
+\x20\x20\x20\x20\x20\x20\x74\x68\x72\x6f\x77\x20\x27\x55\x6e\x6b\
+\x6e\x6f\x77\x6e\x20\x6d\x6f\x64\x75\x6c\x65\x20\x27\x20\x2b\x20\
+\x6e\x61\x6d\x65\x20\x2b\x20\x27\x20\x66\x6f\x72\x20\x72\x65\x71\
+\x75\x69\x72\x65\x28\x29\x27\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x7d\
+\x0a\x0a\x2f\x2f\x20\x4c\x65\x67\x61\x63\x79\x20\x77\x61\x79\x20\
+\x74\x6f\x20\x75\x73\x65\x20\x57\x65\x62\x50\x61\x67\x65\x0a\x77\
+\x69\x6e\x64\x6f\x77\x2e\x57\x65\x62\x50\x61\x67\x65\x20\x3d\x20\
+\x72\x65\x71\x75\x69\x72\x65\x28\x27\x77\x65\x62\x70\x61\x67\x65\
+\x27\x29\x2e\x63\x72\x65\x61\x74\x65\x3b\x0a\x77\x69\x6e\x64\x6f\
+\x77\x2e\x57\x65\x62\x53\x65\x72\x76\x65\x72\x20\x3d\x20\x72\x65\
+\x71\x75\x69\x72\x65\x28\x27\x77\x65\x62\x73\x65\x72\x76\x65\x72\
+\x27\x29\x2e\x63\x72\x65\x61\x74\x65\x3b\x0a\
\x00\x00\x01\x1a\
\x28\
\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x6f\x70\x74\x73\x29\x20\
@@ -4357,6 +4361,295 @@
\x40\x1a\x41\xe2\x10\xf1\xb9\x99\x34\x59\x2e\x08\x20\xc2\x77\x60\
\xad\x8e\x88\xa1\x8d\x43\x29\x4f\x8b\x89\x01\x6b\xfc\xff\x01\x4e\
\x6c\xf6\xa7\
+\x00\x00\x11\xe9\
+\x2f\
+\x2a\x6a\x73\x6c\x69\x6e\x74\x20\x73\x6c\x6f\x70\x70\x79\x3a\x20\
+\x74\x72\x75\x65\x2c\x20\x6e\x6f\x6d\x65\x6e\x3a\x20\x74\x72\x75\
+\x65\x20\x2a\x2f\x0a\x2f\x2a\x67\x6c\x6f\x62\x61\x6c\x20\x65\x78\
+\x70\x6f\x72\x74\x73\x3a\x74\x72\x75\x65\x2c\x70\x68\x61\x6e\x74\
+\x6f\x6d\x3a\x74\x72\x75\x65\x20\x2a\x2f\x0a\x0a\x2f\x2a\x0a\x20\
+\x20\x54\x68\x69\x73\x20\x66\x69\x6c\x65\x20\x69\x73\x20\x70\x61\
+\x72\x74\x20\x6f\x66\x20\x74\x68\x65\x20\x50\x68\x61\x6e\x74\x6f\
+\x6d\x4a\x53\x20\x70\x72\x6f\x6a\x65\x63\x74\x20\x66\x72\x6f\x6d\
+\x20\x4f\x66\x69\x20\x4c\x61\x62\x73\x2e\x0a\x0a\x20\x20\x43\x6f\
+\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x32\x30\x31\x31\
+\x20\x41\x72\x69\x79\x61\x20\x48\x69\x64\x61\x79\x61\x74\x20\x3c\
+\x61\x72\x69\x79\x61\x2e\x68\x69\x64\x61\x79\x61\x74\x40\x67\x6d\
+\x61\x69\x6c\x2e\x63\x6f\x6d\x3e\x0a\x20\x20\x43\x6f\x70\x79\x72\
+\x69\x67\x68\x74\x20\x28\x43\x29\x20\x32\x30\x31\x31\x20\x49\x76\
+\x61\x6e\x20\x44\x65\x20\x4d\x61\x72\x69\x6e\x6f\x20\x3c\x69\x76\
+\x61\x6e\x2e\x64\x65\x2e\x6d\x61\x72\x69\x6e\x6f\x40\x67\x6d\x61\
+\x69\x6c\x2e\x63\x6f\x6d\x3e\x0a\x20\x20\x43\x6f\x70\x79\x72\x69\
+\x67\x68\x74\x20\x28\x43\x29\x20\x32\x30\x31\x31\x20\x4a\x61\x6d\
+\x65\x73\x20\x52\x6f\x65\x20\x3c\x72\x6f\x65\x6a\x61\x6d\x65\x73\
+\x31\x32\x40\x68\x6f\x74\x6d\x61\x69\x6c\x2e\x63\x6f\x6d\x3e\x0a\
+\x20\x20\x43\x6f\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\
+\x32\x30\x31\x31\x20\x65\x78\x65\x63\x6a\x6f\x73\x68\x2c\x20\x68\
+\x74\x74\x70\x3a\x2f\x2f\x65\x78\x65\x63\x6a\x6f\x73\x68\x2e\x62\
+\x6c\x6f\x67\x73\x70\x6f\x74\x2e\x63\x6f\x6d\x0a\x20\x20\x43\x6f\
+\x70\x79\x72\x69\x67\x68\x74\x20\x28\x43\x29\x20\x32\x30\x31\x31\
+\x20\x4b\x6c\x61\x72\xc3\xa4\x6c\x76\x64\x61\x6c\x65\x6e\x73\x20\
+\x44\x61\x74\x61\x6b\x6f\x6e\x73\x75\x6c\x74\x20\x41\x42\x2c\x20\
+\x61\x20\x4b\x44\x41\x42\x20\x47\x72\x6f\x75\x70\x20\x63\x6f\x6d\
+\x70\x61\x6e\x79\x2c\x20\x69\x6e\x66\x6f\x40\x6b\x64\x61\x62\x2e\
+\x63\x6f\x6d\x0a\x20\x20\x41\x75\x74\x68\x6f\x72\x3a\x20\x4d\x69\
+\x6c\x69\x61\x6e\x20\x57\x6f\x6c\x66\x66\x20\x3c\x6d\x69\x6c\x69\
+\x61\x6e\x2e\x77\x6f\x6c\x66\x66\x40\x6b\x64\x61\x62\x2e\x63\x6f\
+\x6d\x3e\x0a\x0a\x20\x20\x52\x65\x64\x69\x73\x74\x72\x69\x62\x75\
+\x74\x69\x6f\x6e\x20\x61\x6e\x64\x20\x75\x73\x65\x20\x69\x6e\x20\
+\x73\x6f\x75\x72\x63\x65\x20\x61\x6e\x64\x20\x62\x69\x6e\x61\x72\
+\x79\x20\x66\x6f\x72\x6d\x73\x2c\x20\x77\x69\x74\x68\x20\x6f\x72\
+\x20\x77\x69\x74\x68\x6f\x75\x74\x0a\x20\x20\x6d\x6f\x64\x69\x66\
+\x69\x63\x61\x74\x69\x6f\x6e\x2c\x20\x61\x72\x65\x20\x70\x65\x72\
+\x6d\x69\x74\x74\x65\x64\x20\x70\x72\x6f\x76\x69\x64\x65\x64\x20\
+\x74\x68\x61\x74\x20\x74\x68\x65\x20\x66\x6f\x6c\x6c\x6f\x77\x69\
+\x6e\x67\x20\x63\x6f\x6e\x64\x69\x74\x69\x6f\x6e\x73\x20\x61\x72\
+\x65\x20\x6d\x65\x74\x3a\x0a\x0a\x20\x20\x20\x20\x2a\x20\x52\x65\
+\x64\x69\x73\x74\x72\x69\x62\x75\x74\x69\x6f\x6e\x73\x20\x6f\x66\
+\x20\x73\x6f\x75\x72\x63\x65\x20\x63\x6f\x64\x65\x20\x6d\x75\x73\
+\x74\x20\x72\x65\x74\x61\x69\x6e\x20\x74\x68\x65\x20\x61\x62\x6f\
+\x76\x65\x20\x63\x6f\x70\x79\x72\x69\x67\x68\x74\x0a\x20\x20\x20\
+\x20\x20\x20\x6e\x6f\x74\x69\x63\x65\x2c\x20\x74\x68\x69\x73\x20\
+\x6c\x69\x73\x74\x20\x6f\x66\x20\x63\x6f\x6e\x64\x69\x74\x69\x6f\
+\x6e\x73\x20\x61\x6e\x64\x20\x74\x68\x65\x20\x66\x6f\x6c\x6c\x6f\
+\x77\x69\x6e\x67\x20\x64\x69\x73\x63\x6c\x61\x69\x6d\x65\x72\x2e\
+\x0a\x20\x20\x20\x20\x2a\x20\x52\x65\x64\x69\x73\x74\x72\x69\x62\
+\x75\x74\x69\x6f\x6e\x73\x20\x69\x6e\x20\x62\x69\x6e\x61\x72\x79\
+\x20\x66\x6f\x72\x6d\x20\x6d\x75\x73\x74\x20\x72\x65\x70\x72\x6f\
+\x64\x75\x63\x65\x20\x74\x68\x65\x20\x61\x62\x6f\x76\x65\x20\x63\
+\x6f\x70\x79\x72\x69\x67\x68\x74\x0a\x20\x20\x20\x20\x20\x20\x6e\
+\x6f\x74\x69\x63\x65\x2c\x20\x74\x68\x69\x73\x20\x6c\x69\x73\x74\
+\x20\x6f\x66\x20\x63\x6f\x6e\x64\x69\x74\x69\x6f\x6e\x73\x20\x61\
+\x6e\x64\x20\x74\x68\x65\x20\x66\x6f\x6c\x6c\x6f\x77\x69\x6e\x67\
+\x20\x64\x69\x73\x63\x6c\x61\x69\x6d\x65\x72\x20\x69\x6e\x20\x74\
+\x68\x65\x0a\x20\x20\x20\x20\x20\x20\x64\x6f\x63\x75\x6d\x65\x6e\
+\x74\x61\x74\x69\x6f\x6e\x20\x61\x6e\x64\x2f\x6f\x72\x20\x6f\x74\
+\x68\x65\x72\x20\x6d\x61\x74\x65\x72\x69\x61\x6c\x73\x20\x70\x72\
+\x6f\x76\x69\x64\x65\x64\x20\x77\x69\x74\x68\x20\x74\x68\x65\x20\
+\x64\x69\x73\x74\x72\x69\x62\x75\x74\x69\x6f\x6e\x2e\x0a\x20\x20\
+\x20\x20\x2a\x20\x4e\x65\x69\x74\x68\x65\x72\x20\x74\x68\x65\x20\
+\x6e\x61\x6d\x65\x20\x6f\x66\x20\x74\x68\x65\x20\x3c\x6f\x72\x67\
+\x61\x6e\x69\x7a\x61\x74\x69\x6f\x6e\x3e\x20\x6e\x6f\x72\x20\x74\
+\x68\x65\x0a\x20\x20\x20\x20\x20\x20\x6e\x61\x6d\x65\x73\x20\x6f\
+\x66\x20\x69\x74\x73\x20\x63\x6f\x6e\x74\x72\x69\x62\x75\x74\x6f\
+\x72\x73\x20\x6d\x61\x79\x20\x62\x65\x20\x75\x73\x65\x64\x20\x74\
+\x6f\x20\x65\x6e\x64\x6f\x72\x73\x65\x20\x6f\x72\x20\x70\x72\x6f\
+\x6d\x6f\x74\x65\x20\x70\x72\x6f\x64\x75\x63\x74\x73\x0a\x20\x20\
+\x20\x20\x20\x20\x64\x65\x72\x69\x76\x65\x64\x20\x66\x72\x6f\x6d\
+\x20\x74\x68\x69\x73\x20\x73\x6f\x66\x74\x77\x61\x72\x65\x20\x77\
+\x69\x74\x68\x6f\x75\x74\x20\x73\x70\x65\x63\x69\x66\x69\x63\x20\
+\x70\x72\x69\x6f\x72\x20\x77\x72\x69\x74\x74\x65\x6e\x20\x70\x65\
+\x72\x6d\x69\x73\x73\x69\x6f\x6e\x2e\x0a\x0a\x20\x20\x54\x48\x49\
+\x53\x20\x53\x4f\x46\x54\x57\x41\x52\x45\x20\x49\x53\x20\x50\x52\
+\x4f\x56\x49\x44\x45\x44\x20\x42\x59\x20\x54\x48\x45\x20\x43\x4f\
+\x50\x59\x52\x49\x47\x48\x54\x20\x48\x4f\x4c\x44\x45\x52\x53\x20\
+\x41\x4e\x44\x20\x43\x4f\x4e\x54\x52\x49\x42\x55\x54\x4f\x52\x53\
+\x20\x22\x41\x53\x20\x49\x53\x22\x0a\x20\x20\x41\x4e\x44\x20\x41\
+\x4e\x59\x20\x45\x58\x50\x52\x45\x53\x53\x20\x4f\x52\x20\x49\x4d\
+\x50\x4c\x49\x45\x44\x20\x57\x41\x52\x52\x41\x4e\x54\x49\x45\x53\
+\x2c\x20\x49\x4e\x43\x4c\x55\x44\x49\x4e\x47\x2c\x20\x42\x55\x54\
+\x20\x4e\x4f\x54\x20\x4c\x49\x4d\x49\x54\x45\x44\x20\x54\x4f\x2c\
+\x20\x54\x48\x45\x0a\x20\x20\x49\x4d\x50\x4c\x49\x45\x44\x20\x57\
+\x41\x52\x52\x41\x4e\x54\x49\x45\x53\x20\x4f\x46\x20\x4d\x45\x52\
+\x43\x48\x41\x4e\x54\x41\x42\x49\x4c\x49\x54\x59\x20\x41\x4e\x44\
+\x20\x46\x49\x54\x4e\x45\x53\x53\x20\x46\x4f\x52\x20\x41\x20\x50\
+\x41\x52\x54\x49\x43\x55\x4c\x41\x52\x20\x50\x55\x52\x50\x4f\x53\
+\x45\x0a\x20\x20\x41\x52\x45\x20\x44\x49\x53\x43\x4c\x41\x49\x4d\
+\x45\x44\x2e\x20\x49\x4e\x20\x4e\x4f\x20\x45\x56\x45\x4e\x54\x20\
+\x53\x48\x41\x4c\x4c\x20\x3c\x43\x4f\x50\x59\x52\x49\x47\x48\x54\
+\x20\x48\x4f\x4c\x44\x45\x52\x3e\x20\x42\x45\x20\x4c\x49\x41\x42\
+\x4c\x45\x20\x46\x4f\x52\x20\x41\x4e\x59\x0a\x20\x20\x44\x49\x52\
+\x45\x43\x54\x2c\x20\x49\x4e\x44\x49\x52\x45\x43\x54\x2c\x20\x49\
+\x4e\x43\x49\x44\x45\x4e\x54\x41\x4c\x2c\x20\x53\x50\x45\x43\x49\
+\x41\x4c\x2c\x20\x45\x58\x45\x4d\x50\x4c\x41\x52\x59\x2c\x20\x4f\
+\x52\x20\x43\x4f\x4e\x53\x45\x51\x55\x45\x4e\x54\x49\x41\x4c\x20\
+\x44\x41\x4d\x41\x47\x45\x53\x0a\x20\x20\x28\x49\x4e\x43\x4c\x55\
+\x44\x49\x4e\x47\x2c\x20\x42\x55\x54\x20\x4e\x4f\x54\x20\x4c\x49\
+\x4d\x49\x54\x45\x44\x20\x54\x4f\x2c\x20\x50\x52\x4f\x43\x55\x52\
+\x45\x4d\x45\x4e\x54\x20\x4f\x46\x20\x53\x55\x42\x53\x54\x49\x54\
+\x55\x54\x45\x20\x47\x4f\x4f\x44\x53\x20\x4f\x52\x20\x53\x45\x52\
+\x56\x49\x43\x45\x53\x3b\x0a\x20\x20\x4c\x4f\x53\x53\x20\x4f\x46\
+\x20\x55\x53\x45\x2c\x20\x44\x41\x54\x41\x2c\x20\x4f\x52\x20\x50\
+\x52\x4f\x46\x49\x54\x53\x3b\x20\x4f\x52\x20\x42\x55\x53\x49\x4e\
+\x45\x53\x53\x20\x49\x4e\x54\x45\x52\x52\x55\x50\x54\x49\x4f\x4e\
+\x29\x20\x48\x4f\x57\x45\x56\x45\x52\x20\x43\x41\x55\x53\x45\x44\
+\x20\x41\x4e\x44\x0a\x20\x20\x4f\x4e\x20\x41\x4e\x59\x20\x54\x48\
+\x45\x4f\x52\x59\x20\x4f\x46\x20\x4c\x49\x41\x42\x49\x4c\x49\x54\
+\x59\x2c\x20\x57\x48\x45\x54\x48\x45\x52\x20\x49\x4e\x20\x43\x4f\
+\x4e\x54\x52\x41\x43\x54\x2c\x20\x53\x54\x52\x49\x43\x54\x20\x4c\
+\x49\x41\x42\x49\x4c\x49\x54\x59\x2c\x20\x4f\x52\x20\x54\x4f\x52\
+\x54\x0a\x20\x20\x28\x49\x4e\x43\x4c\x55\x44\x49\x4e\x47\x20\x4e\
+\x45\x47\x4c\x49\x47\x45\x4e\x43\x45\x20\x4f\x52\x20\x4f\x54\x48\
+\x45\x52\x57\x49\x53\x45\x29\x20\x41\x52\x49\x53\x49\x4e\x47\x20\
+\x49\x4e\x20\x41\x4e\x59\x20\x57\x41\x59\x20\x4f\x55\x54\x20\x4f\
+\x46\x20\x54\x48\x45\x20\x55\x53\x45\x20\x4f\x46\x0a\x20\x20\x54\
+\x48\x49\x53\x20\x53\x4f\x46\x54\x57\x41\x52\x45\x2c\x20\x45\x56\
+\x45\x4e\x20\x49\x46\x20\x41\x44\x56\x49\x53\x45\x44\x20\x4f\x46\
+\x20\x54\x48\x45\x20\x50\x4f\x53\x53\x49\x42\x49\x4c\x49\x54\x59\
+\x20\x4f\x46\x20\x53\x55\x43\x48\x20\x44\x41\x4d\x41\x47\x45\x2e\
+\x0a\x2a\x2f\x0a\x0a\x65\x78\x70\x6f\x72\x74\x73\x2e\x63\x72\x65\
+\x61\x74\x65\x20\x3d\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\
+\x6f\x70\x74\x73\x29\x20\x7b\x0a\x20\x20\x20\x20\x76\x61\x72\x20\
+\x73\x65\x72\x76\x65\x72\x20\x3d\x20\x70\x68\x61\x6e\x74\x6f\x6d\
+\x2e\x63\x72\x65\x61\x74\x65\x57\x65\x62\x53\x65\x72\x76\x65\x72\
+\x28\x29\x3b\x0a\x20\x20\x20\x20\x76\x61\x72\x20\x68\x61\x6e\x64\
+\x6c\x65\x72\x73\x20\x3d\x20\x7b\x7d\x3b\x0a\x0a\x20\x20\x20\x20\
+\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x63\x68\x65\x63\x6b\x54\x79\
+\x70\x65\x28\x6f\x2c\x20\x74\x79\x70\x65\x29\x20\x7b\x0a\x20\x20\
+\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x74\x79\x70\
+\x65\x6f\x66\x20\x6f\x20\x3d\x3d\x3d\x20\x74\x79\x70\x65\x3b\x0a\
+\x20\x20\x20\x20\x7d\x0a\x0a\x20\x20\x20\x20\x66\x75\x6e\x63\x74\
+\x69\x6f\x6e\x20\x69\x73\x4f\x62\x6a\x65\x63\x74\x28\x6f\x29\x20\
+\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\
+\x20\x63\x68\x65\x63\x6b\x54\x79\x70\x65\x28\x6f\x2c\x20\x27\x6f\
+\x62\x6a\x65\x63\x74\x27\x29\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x0a\
+\x20\x20\x20\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x69\x73\x55\
+\x6e\x64\x65\x66\x69\x6e\x65\x64\x28\x6f\x29\x20\x7b\x0a\x20\x20\
+\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x63\x68\x65\
+\x63\x6b\x54\x79\x70\x65\x28\x6f\x2c\x20\x27\x75\x6e\x64\x65\x66\
+\x69\x6e\x65\x64\x27\x29\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x0a\x20\
+\x20\x20\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x69\x73\x55\x6e\
+\x64\x65\x66\x69\x6e\x65\x64\x4f\x72\x4e\x75\x6c\x6c\x28\x6f\x29\
+\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\
+\x6e\x20\x69\x73\x55\x6e\x64\x65\x66\x69\x6e\x65\x64\x28\x6f\x29\
+\x20\x7c\x7c\x20\x6e\x75\x6c\x6c\x20\x3d\x3d\x3d\x20\x6f\x3b\x0a\
+\x20\x20\x20\x20\x7d\x0a\x0a\x20\x20\x20\x20\x66\x75\x6e\x63\x74\
+\x69\x6f\x6e\x20\x63\x6f\x70\x79\x49\x6e\x74\x6f\x28\x74\x61\x72\
+\x67\x65\x74\x2c\x20\x73\x6f\x75\x72\x63\x65\x29\x20\x7b\x0a\x20\
+\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\x74\x61\x72\x67\x65\
+\x74\x20\x3d\x3d\x3d\x20\x73\x6f\x75\x72\x63\x65\x20\x7c\x7c\x20\
+\x69\x73\x55\x6e\x64\x65\x66\x69\x6e\x65\x64\x4f\x72\x4e\x75\x6c\
+\x6c\x28\x73\x6f\x75\x72\x63\x65\x29\x29\x20\x7b\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\
+\x74\x61\x72\x67\x65\x74\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x7d\x0a\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x74\x61\x72\x67\x65\
+\x74\x20\x3d\x20\x74\x61\x72\x67\x65\x74\x20\x7c\x7c\x20\x7b\x7d\
+\x3b\x0a\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x2f\x2f\x20\x43\x6f\
+\x70\x79\x20\x69\x6e\x74\x6f\x20\x6f\x62\x6a\x65\x63\x74\x73\x20\
+\x6f\x6e\x6c\x79\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\
+\x28\x69\x73\x4f\x62\x6a\x65\x63\x74\x28\x74\x61\x72\x67\x65\x74\
+\x29\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x2f\x2f\x20\x4d\x61\x6b\x65\x20\x73\x75\x72\x65\x20\x73\x6f\
+\x75\x72\x63\x65\x20\x65\x78\x69\x73\x74\x73\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x73\x6f\x75\x72\x63\x65\x20\x3d\
+\x20\x73\x6f\x75\x72\x63\x65\x20\x7c\x7c\x20\x7b\x7d\x3b\x0a\x0a\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\
+\x69\x73\x4f\x62\x6a\x65\x63\x74\x28\x73\x6f\x75\x72\x63\x65\x29\
+\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x76\x61\x72\x20\x69\x2c\x20\x6e\x65\x77\x54\x61\
+\x72\x67\x65\x74\x2c\x20\x6e\x65\x77\x53\x6f\x75\x72\x63\x65\x3b\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x66\x6f\x72\x20\x28\x69\x20\x69\x6e\x20\x73\x6f\x75\x72\x63\
+\x65\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\x20\x28\x73\x6f\x75\
+\x72\x63\x65\x2e\x68\x61\x73\x4f\x77\x6e\x50\x72\x6f\x70\x65\x72\
+\x74\x79\x28\x69\x29\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x6e\x65\x77\x54\x61\x72\x67\x65\x74\x20\x3d\x20\x74\x61\x72\
+\x67\x65\x74\x5b\x69\x5d\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x6e\x65\x77\x53\x6f\x75\x72\x63\x65\x20\x3d\x20\x73\x6f\x75\x72\
+\x63\x65\x5b\x69\x5d\x3b\x0a\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x69\x66\x20\x28\x6e\x65\x77\x54\x61\x72\x67\x65\x74\x20\x26\x26\
+\x20\x69\x73\x4f\x62\x6a\x65\x63\x74\x28\x6e\x65\x77\x53\x6f\x75\
+\x72\x63\x65\x29\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x2f\x2f\x20\x44\x65\x65\x70\x20\x63\x6f\x70\x79\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x6e\x65\x77\
+\x54\x61\x72\x67\x65\x74\x20\x3d\x20\x63\x6f\x70\x79\x49\x6e\x74\
+\x6f\x28\x74\x61\x72\x67\x65\x74\x5b\x69\x5d\x2c\x20\x6e\x65\x77\
+\x53\x6f\x75\x72\x63\x65\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x7d\x20\x65\x6c\x73\x65\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x6e\x65\x77\x54\x61\x72\x67\x65\x74\x20\
+\x3d\x20\x6e\x65\x77\x53\x6f\x75\x72\x63\x65\x3b\x0a\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x7d\x0a\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x69\x66\x20\x28\x21\x69\x73\x55\x6e\x64\x65\x66\x69\x6e\x65\x64\
+\x28\x6e\x65\x77\x54\x61\x72\x67\x65\x74\x29\x29\x20\x7b\x0a\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x61\x72\x67\x65\
+\x74\x5b\x69\x5d\x20\x3d\x20\x6e\x65\x77\x54\x61\x72\x67\x65\x74\
+\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x7d\x20\x65\x6c\x73\x65\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x61\x72\x67\x65\x74\x20\
+\x3d\x20\x73\x6f\x75\x72\x63\x65\x3b\x0a\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x7d\x0a\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x72\x65\x74\x75\x72\
+\x6e\x20\x74\x61\x72\x67\x65\x74\x3b\x0a\x20\x20\x20\x20\x7d\x0a\
+\x0a\x20\x20\x20\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x64\x65\
+\x66\x69\x6e\x65\x53\x65\x74\x74\x65\x72\x28\x68\x61\x6e\x64\x6c\
+\x65\x72\x4e\x61\x6d\x65\x2c\x20\x73\x69\x67\x6e\x61\x6c\x4e\x61\
+\x6d\x65\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x65\
+\x72\x76\x65\x72\x2e\x5f\x5f\x64\x65\x66\x69\x6e\x65\x53\x65\x74\
+\x74\x65\x72\x5f\x5f\x28\x68\x61\x6e\x64\x6c\x65\x72\x4e\x61\x6d\
+\x65\x2c\x20\x66\x75\x6e\x63\x74\x69\x6f\x6e\x20\x28\x66\x29\x20\
+\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x69\x66\
+\x20\x28\x68\x61\x6e\x64\x6c\x65\x72\x73\x20\x26\x26\x20\x74\x79\
+\x70\x65\x6f\x66\x20\x68\x61\x6e\x64\x6c\x65\x72\x73\x5b\x73\x69\
+\x67\x6e\x61\x6c\x4e\x61\x6d\x65\x5d\x20\x3d\x3d\x3d\x20\x27\x66\
+\x75\x6e\x63\x74\x69\x6f\x6e\x27\x29\x20\x7b\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x72\x79\x20\
+\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x5b\x73\x69\x67\x6e\x61\
+\x6c\x4e\x61\x6d\x65\x5d\x2e\x64\x69\x73\x63\x6f\x6e\x6e\x65\x63\
+\x74\x28\x68\x61\x6e\x64\x6c\x65\x72\x73\x5b\x73\x69\x67\x6e\x61\
+\x6c\x4e\x61\x6d\x65\x5d\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x20\x63\x61\x74\x63\x68\
+\x20\x28\x65\x29\x20\x7b\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x68\x61\x6e\x64\x6c\x65\x72\x73\x5b\x73\x69\x67\x6e\x61\
+\x6c\x4e\x61\x6d\x65\x5d\x20\x3d\x20\x66\x3b\x0a\x20\x20\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x5b\x73\x69\x67\
+\x6e\x61\x6c\x4e\x61\x6d\x65\x5d\x2e\x63\x6f\x6e\x6e\x65\x63\x74\
+\x28\x68\x61\x6e\x64\x6c\x65\x72\x73\x5b\x73\x69\x67\x6e\x61\x6c\
+\x4e\x61\x6d\x65\x5d\x29\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\
+\x7d\x29\x3b\x0a\x20\x20\x20\x20\x7d\x0a\x0a\x20\x20\x20\x20\x2f\
+\x2f\x20\x64\x65\x65\x70\x20\x63\x6f\x70\x79\x0a\x20\x20\x20\x20\
+\x2f\x2f\x54\x4f\x44\x4f\x3a\x20\x75\x73\x65\x20\x74\x68\x69\x73\
+\x3f\x0a\x2f\x2f\x20\x20\x20\x20\x20\x73\x65\x72\x76\x65\x72\x2e\
+\x73\x65\x74\x74\x69\x6e\x67\x73\x20\x3d\x20\x4a\x53\x4f\x4e\x2e\
+\x70\x61\x72\x73\x65\x28\x4a\x53\x4f\x4e\x2e\x73\x74\x72\x69\x6e\
+\x67\x69\x66\x79\x28\x70\x68\x61\x6e\x74\x6f\x6d\x2e\x64\x65\x66\
+\x61\x75\x6c\x74\x53\x65\x72\x76\x65\x72\x53\x65\x74\x74\x69\x6e\
+\x67\x73\x29\x29\x3b\x0a\x0a\x20\x20\x20\x20\x64\x65\x66\x69\x6e\
+\x65\x53\x65\x74\x74\x65\x72\x28\x22\x6f\x6e\x4e\x65\x77\x52\x65\
+\x71\x75\x65\x73\x74\x22\x2c\x20\x22\x6e\x65\x77\x52\x65\x71\x75\
+\x65\x73\x74\x22\x29\x3b\x0a\x0a\x20\x20\x20\x20\x73\x65\x72\x76\
+\x65\x72\x2e\x6c\x69\x73\x74\x65\x6e\x20\x3d\x20\x66\x75\x6e\x63\
+\x74\x69\x6f\x6e\x20\x28\x70\x6f\x72\x74\x2c\x20\x68\x61\x6e\x64\
+\x6c\x65\x72\x29\x20\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x69\
+\x66\x20\x28\x61\x72\x67\x75\x6d\x65\x6e\x74\x73\x2e\x6c\x65\x6e\
+\x67\x74\x68\x20\x3d\x3d\x3d\x20\x32\x20\x26\x26\x20\x74\x79\x70\
+\x65\x6f\x66\x20\x68\x61\x6e\x64\x6c\x65\x72\x20\x3d\x3d\x3d\x20\
+\x27\x66\x75\x6e\x63\x74\x69\x6f\x6e\x27\x29\x20\x7b\x0a\x20\x20\
+\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x74\x68\x69\x73\x2e\x6f\
+\x6e\x4e\x65\x77\x52\x65\x71\x75\x65\x73\x74\x20\x3d\x20\x68\x61\
+\x6e\x64\x6c\x65\x72\x3b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x20\x20\x2f\x2f\x54\x4f\x44\x4f\x3a\x20\x73\x65\x74\x74\x69\
+\x6e\x67\x73\x3f\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\x20\
+\x20\x72\x65\x74\x75\x72\x6e\x20\x74\x68\x69\x73\x2e\x6c\x69\x73\
+\x74\x65\x6e\x4f\x6e\x50\x6f\x72\x74\x28\x70\x6f\x72\x74\x29\x3b\
+\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x7d\x0a\x20\x20\x20\x20\x20\
+\x20\x20\x20\x74\x68\x72\x6f\x77\x20\x22\x57\x72\x6f\x6e\x67\x20\
+\x75\x73\x65\x20\x6f\x66\x20\x57\x65\x62\x53\x65\x72\x76\x65\x72\
+\x23\x6c\x69\x73\x74\x65\x6e\x22\x3b\x0a\x20\x20\x20\x20\x7d\x3b\
+\x0a\x0a\x20\x20\x20\x20\x2f\x2f\x20\x43\x6f\x70\x79\x20\x6f\x70\
+\x74\x69\x6f\x6e\x73\x20\x69\x6e\x74\x6f\x20\x73\x65\x72\x76\x65\
+\x72\x0a\x20\x20\x20\x20\x69\x66\x20\x28\x6f\x70\x74\x73\x29\x20\
+\x7b\x0a\x20\x20\x20\x20\x20\x20\x20\x20\x73\x65\x72\x76\x65\x72\
+\x20\x3d\x20\x63\x6f\x70\x79\x49\x6e\x74\x6f\x28\x73\x65\x72\x76\
+\x65\x72\x2c\x20\x6f\x70\x74\x73\x29\x3b\x0a\x20\x20\x20\x20\x7d\
+\x0a\x0a\x20\x20\x20\x20\x72\x65\x74\x75\x72\x6e\x20\x73\x65\x72\
+\x76\x65\x72\x3b\x0a\x7d\x3b\x0a\
\x00\x00\x18\x67\
\x2f\
\x2a\x6a\x73\x6c\x69\x6e\x74\x20\x73\x6c\x6f\x70\x70\x79\x3a\x20\
@@ -5097,6 +5390,10 @@
\x00\x7d\x71\x73\
\x00\x63\
\x00\x6f\x00\x66\x00\x66\x00\x65\x00\x65\x00\x2d\x00\x73\x00\x63\x00\x72\x00\x69\x00\x70\x00\x74\x00\x2e\x00\x6a\x00\x73\
+\x00\x0c\
+\x06\x7b\x66\x93\
+\x00\x77\
+\x00\x65\x00\x62\x00\x73\x00\x65\x00\x72\x00\x76\x00\x65\x00\x72\x00\x2e\x00\x6a\x00\x73\
\x00\x0a\
\x06\x72\xf2\x33\
\x00\x77\
@@ -5109,14 +5406,15 @@
qt_resource_struct = "\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x04\x00\x00\x00\x01\
-\x00\x00\x00\x32\x00\x00\x00\x00\x00\x01\x00\x00\x09\x79\
-\x00\x00\x00\x00\x00\x02\x00\x00\x00\x02\x00\x00\x00\x07\
+\x00\x00\x00\x32\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc0\
+\x00\x00\x00\x00\x00\x02\x00\x00\x00\x03\x00\x00\x00\x07\
\x00\x00\x00\x14\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x00\x56\x00\x02\x00\x00\x00\x02\x00\x00\x00\x05\
-\x00\x00\x00\x9c\x00\x01\x00\x00\x00\x01\x00\x00\x60\xc2\
-\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x0a\x97\
-\x00\x00\x00\xdc\x00\x00\x00\x00\x00\x01\x00\x01\x27\x85\
-\x00\x00\x00\xc2\x00\x00\x00\x00\x00\x01\x00\x01\x0f\x1a\
+\x00\x00\x00\x9c\x00\x01\x00\x00\x00\x01\x00\x00\x61\x09\
+\x00\x00\x00\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x0a\xde\
+\x00\x00\x00\xfa\x00\x00\x00\x00\x00\x01\x00\x01\x39\xb9\
+\x00\x00\x00\xe0\x00\x00\x00\x00\x00\x01\x00\x01\x21\x4e\
+\x00\x00\x00\xc2\x00\x00\x00\x00\x00\x01\x00\x01\x0f\x61\
"
def qInitResources():
diff -Nru phantomjs-1.3.0+dfsg/python/pyphantomjs/resources.qrc phantomjs-1.4.0+dfsg/python/pyphantomjs/resources.qrc
--- phantomjs-1.3.0+dfsg/python/pyphantomjs/resources.qrc 2011-10-29 09:20:23.000000000 +0000
+++ phantomjs-1.4.0+dfsg/python/pyphantomjs/resources.qrc 2011-12-27 13:46:57.000000000 +0000
@@ -4,6 +4,7 @@
configurator.js
modules/fs.js
modules/webpage.js
+ modules/webserver.js
resources/coffee-script.js
resources/pyphantomjs-icon.png