diff stringlengths 65 26.7k | message stringlengths 7 9.92k |
|---|---|
diff --git a/src/Freq.php b/src/Freq.php
index <HASH>..<HASH> 100644
--- a/src/Freq.php
+++ b/src/Freq.php
@@ -276,7 +276,16 @@ class Freq {
return $ts;
}
+ //EOP needs to have the same TIME as START ($t)
+ $tO = new \DateTime('@'.$t, new \DateTimeZone('UTC'));
+
$eop = $this->findEndOfPeriod($offset);
+ $eopO = new \DateTime('@'.$eop, new \DateTimeZone('UTC'));
+ $eopO->setTime($tO->format('H'),$tO->format('i'),$tO->format('s'));
+ $eop = $eopO->getTimestamp();
+ unset($eopO);
+ unset($tO);
+
if ($debug) echo 'EOP: ' . date('r', $eop) . "\n";
foreach ($this->knownRules AS $rule) { | Fixes #<I>, set EOP (End of Period) TIME to START time |
diff --git a/cmd/structcheck/structcheck.go b/cmd/structcheck/structcheck.go
index <HASH>..<HASH> 100644
--- a/cmd/structcheck/structcheck.go
+++ b/cmd/structcheck/structcheck.go
@@ -161,6 +161,8 @@ func main() {
}
fset, astFiles := check.ASTFilesForPackage(pkgPath)
imp := importer.New()
+ // Preliminary cgo support.
+ imp.Config = importer.Config{UseGcFallback: true}
config := types.Config{Import: imp.Import}
var err error
visitor.pkg, err = config.Check(pkgPath, fset, astFiles, &visitor.info)
diff --git a/cmd/varcheck/varcheck.go b/cmd/varcheck/varcheck.go
index <HASH>..<HASH> 100644
--- a/cmd/varcheck/varcheck.go
+++ b/cmd/varcheck/varcheck.go
@@ -101,6 +101,8 @@ func main() {
}
fset, astFiles := check.ASTFilesForPackage(pkgPath)
imp := importer.New()
+ // Preliminary cgo support.
+ imp.Config = importer.Config{UseGcFallback: true}
config := types.Config{Import: imp.Import}
var err error
visitor.pkg, err = config.Check(pkgPath, fset, astFiles, &visitor.info) | Add cgo support (fixes #4) |
diff --git a/src/Twig/PageExtension.php b/src/Twig/PageExtension.php
index <HASH>..<HASH> 100644
--- a/src/Twig/PageExtension.php
+++ b/src/Twig/PageExtension.php
@@ -80,12 +80,17 @@ class PageExtension extends \Twig_Extension
return $ret;
}
- foreach ($this->propertyInfo->getProperties($class) as $property) {
- $description = $this->propertyInfo->getShortDescription($class, $property);
- if ($description) {
- $ret[$property] = $description;
- } else {
- $ret[$property] = $property;
+ $properties = $this->propertyInfo->getProperties($class);
+
+ // Properties can be null
+ if ($properties) {
+ foreach ($properties as $property) {
+ $description = $this->propertyInfo->getShortDescription($class, $property);
+ if ($description) {
+ $ret[$property] = $description;
+ } else {
+ $ret[$property] = $property;
+ }
}
} | avoid Twig crashes when the PropertyInfo component does not find any properties on class |
diff --git a/concrete/src/Calendar/Event/EventService.php b/concrete/src/Calendar/Event/EventService.php
index <HASH>..<HASH> 100755
--- a/concrete/src/Calendar/Event/EventService.php
+++ b/concrete/src/Calendar/Event/EventService.php
@@ -152,7 +152,7 @@ class EventService
$type = Type::getByID($calendar->getEventPageTypeID());
if (is_object($type)) {
$page = $parent->add($type, array('cName' => $event->getName()));
- $page->setAttribute($calendar->getEventPageAttributeKeyHandle(), $this);
+ $page->setAttribute($calendar->getEventPageAttributeKeyHandle(), $event);
$event->setPageID($page->getCollectionID());
$event->setRelatedPageRelationType('C');
$this->save($event); | Pass the event as opposed to the service to the pages related event attribute. |
diff --git a/emir/dataproducts.py b/emir/dataproducts.py
index <HASH>..<HASH> 100644
--- a/emir/dataproducts.py
+++ b/emir/dataproducts.py
@@ -20,14 +20,13 @@
'''Data products produced by the EMIR pipeline.'''
import logging
-
import pyfits
from numina.recipes import Image
-from emir.instrument import EmirImageFactory
-_logger = logging.getLogger('emir.dataproducts')
+from .simulator import EmirImageFactory
+_logger = logging.getLogger('emir.dataproducts')
class MasterBadPixelMask(Image):
def __init__(self, hdu): | EmirImageFactory has moved to simulator module |
diff --git a/httpinvoke-node.js b/httpinvoke-node.js
index <HASH>..<HASH> 100644
--- a/httpinvoke-node.js
+++ b/httpinvoke-node.js
@@ -35,6 +35,10 @@ module.exports = function(uri, method, options) {
path: uri.path,
method: method
}, function(res) {
+ if(statusCb) {
+ statusCb(res.statusCode, res.headers);
+ statusCb = null;
+ }
if(cb) {
var output = '';
res.setEncoding('utf8'); | -node: implement options.gotStatus |
diff --git a/lib/editor/htmlarea/popups/select_color.php b/lib/editor/htmlarea/popups/select_color.php
index <HASH>..<HASH> 100644
--- a/lib/editor/htmlarea/popups/select_color.php
+++ b/lib/editor/htmlarea/popups/select_color.php
@@ -1,8 +1,11 @@
<?php
include("../../../../config.php");
?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
+<meta http-equiv="content-type" content="text/html; charset=<?php print_string("thischarset");?>" />
<title><?php print_string("selectcolor","editor");?></title>
<style type="text/css">
html, body { width: 238; height: 188; } | select_color.php popup should specify charset MDL-<I>; patch by Hiroto Kagotani; merged from MOODLE_<I>_STABLE |
diff --git a/simuvex/s_state.py b/simuvex/s_state.py
index <HASH>..<HASH> 100644
--- a/simuvex/s_state.py
+++ b/simuvex/s_state.py
@@ -86,6 +86,7 @@ class SimState(ana.Storable): # pylint: disable=R0904
# this is a global condition, applied to all added constraints, memory reads, etc
self._global_condition = None
+ self.eip_constraints = []
def _ana_getstate(self):
s = dict(ana.Storable._ana_getstate(self))
@@ -326,6 +327,7 @@ class SimState(ana.Storable): # pylint: disable=R0904
state.uninitialized_access_handler = self.uninitialized_access_handler
state._special_memory_filler = self._special_memory_filler
+ state.eip_constraints = self.eip_constraints
return state | eip_constraints in state |
diff --git a/lib/skpm-link.js b/lib/skpm-link.js
index <HASH>..<HASH> 100644
--- a/lib/skpm-link.js
+++ b/lib/skpm-link.js
@@ -72,9 +72,11 @@ if (!packageJSON.name) {
console.log(chalk.dim('[1/1]') + ' 🔗 Symlinking the plugin ' + packageJSON.name + '...')
try {
- if (!fs.existsSync(path.join(pluginDirectory, packageJSON.name))) {
- fs.mkdirSync(path.join(pluginDirectory, packageJSON.name))
+ if (fs.existsSync(path.join(pluginDirectory, packageJSON.name))) {
+ return console.log(chalk.red('error') + ' This plugin has already been linked.')
}
+
+ fs.mkdirSync(path.join(pluginDirectory, packageJSON.name))
fs.symlinkSync(getPath(packageJSON.main), path.join(pluginDirectory, packageJSON.name, packageJSON.main))
testDevMode(function () { | Generating a clearer error message when a plugin has already been linked |
diff --git a/awsshell/ui.py b/awsshell/ui.py
index <HASH>..<HASH> 100644
--- a/awsshell/ui.py
+++ b/awsshell/ui.py
@@ -109,6 +109,13 @@ def create_default_layout(app, message='',
else:
return LayoutDimension()
+ def separator():
+ return ConditionalContainer(
+ content=Window(height=LayoutDimension.exact(1),
+ content=FillControl(u'\u2500',
+ token=Token.Separator)),
+ filter=HasDocumentation(app) & ~IsDone())
+
# Create and return Layout instance.
return HSplit([
ConditionalContainer(
@@ -154,7 +161,7 @@ def create_default_layout(app, message='',
]
),
]),
- # Docs container.
+ separator(),
ConditionalContainer(
content=Window(
BufferControl(
@@ -163,12 +170,7 @@ def create_default_layout(app, message='',
height=LayoutDimension(max=15)),
filter=HasDocumentation(app) & ~IsDone(),
),
- # Toolbar options container.
- ConditionalContainer(
- content=Window(height=LayoutDimension.exact(1),
- content=FillControl(u'\u2500',
- token=Token.Separator)),
- filter=HasDocumentation(app) & ~IsDone()),
+ separator(),
ValidationToolbar(),
SystemToolbar(), | Set separators above and below the help pane. |
diff --git a/godbf/dbfreader.go b/godbf/dbfreader.go
index <HASH>..<HASH> 100644
--- a/godbf/dbfreader.go
+++ b/godbf/dbfreader.go
@@ -5,7 +5,7 @@ import (
"errors"
"os"
"time"
- "mahonia"
+ "code.google.com/p/mahonia"
"strings"
"strconv"
) | Chanigng mahonia dependency to google.com/p/mahonia |
diff --git a/lib/dom2.js b/lib/dom2.js
index <HASH>..<HASH> 100644
--- a/lib/dom2.js
+++ b/lib/dom2.js
@@ -60,13 +60,20 @@ AbstractXHRObject.prototype._start = function(method, url, payload, opts) {
var status = x.status;
var text = x.responseText;
} catch (x) {};
+ // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+ if (status === 1223) status = 204;
+
// IE does return readystate == 3 for 404 answers.
if (text && text.length > 0) {
that.emit('chunk', status, text);
}
break;
case 4:
- that.emit('finish', x.status, x.responseText);
+ var status = x.status;
+ // IE returns 1223 for 204: http://bugs.jquery.com/ticket/1450
+ if (status === 1223) status = 204;
+
+ that.emit('finish', status, x.responseText);
that._cleanup(false);
break;
} | Work around another IE bug - <I> gets mangled to <I> |
diff --git a/registry/client/repository.go b/registry/client/repository.go
index <HASH>..<HASH> 100644
--- a/registry/client/repository.go
+++ b/registry/client/repository.go
@@ -36,8 +36,21 @@ func checkHTTPRedirect(req *http.Request, via []*http.Request) error {
if len(via) > 0 {
for headerName, headerVals := range via[0].Header {
- if headerName == "Accept" || headerName == "Range" {
- for _, val := range headerVals {
+ if headerName != "Accept" && headerName != "Range" {
+ continue
+ }
+ for _, val := range headerVals {
+ // Don't add to redirected request if redirected
+ // request already has a header with the same
+ // name and value.
+ hasValue := false
+ for _, existingVal := range req.Header[headerName] {
+ if existingVal == val {
+ hasValue = true
+ break
+ }
+ }
+ if !hasValue {
req.Header.Add(headerName, val)
}
} | On redirect, only copy headers when they don't already exist in the redirected request
A changeset under consideration for Go <I> would automatically copy
headers on redirect. This change future-proofs our code so we won't make
duplicate copies of the headers if net/http does it automatically in the
future. |
diff --git a/lib/Compilation.js b/lib/Compilation.js
index <HASH>..<HASH> 100644
--- a/lib/Compilation.js
+++ b/lib/Compilation.js
@@ -34,7 +34,7 @@ function Compilation(compiler) {
this.performance = options && options.performance;
this.mainTemplate = new MainTemplate(this.outputOptions);
- this.chunkTemplate = new ChunkTemplate(this.outputOptions, this.mainTemplate);
+ this.chunkTemplate = new ChunkTemplate(this.outputOptions);
this.hotUpdateChunkTemplate = new HotUpdateChunkTemplate(this.outputOptions);
this.moduleTemplate = new ModuleTemplate(this.outputOptions); | remove second param to `ChunkTemplate` constructor
the ChunkTemplate contructor only expects one parameter, therefore it seams unnecessary that `this.mainTemplate` is passed |
diff --git a/modules/text/text.test.js b/modules/text/text.test.js
index <HASH>..<HASH> 100644
--- a/modules/text/text.test.js
+++ b/modules/text/text.test.js
@@ -53,6 +53,24 @@ test("makePath", (t) => {
t.is(ctx.strokeStyle, t.context.options.stroke);
});
+test("makePath with underscore", (t) => {
+ t.context.text = " ";
+ t.context.options.underscore = true;
+
+ const ctx = {
+ beginPath: () => t.pass(),
+ fillText: () => t.pass(),
+ moveTo: () => t.pass(),
+ lineTo: () => t.pass(),
+ stroke: () => t.pass(),
+ closePath: () => t.pass(),
+ };
+ t.plan(7);
+
+ t.context.makePath(ctx);
+ t.is(ctx.strokeStyle, t.context.options.fill);
+});
+
test("makePath with no text", (t) => {
const ctx = {
fillText: () => t.fail(), | :white_check_mark: Adding tests.
Add tests for Text's underscore option |
diff --git a/salt/modules/file.py b/salt/modules/file.py
index <HASH>..<HASH> 100644
--- a/salt/modules/file.py
+++ b/salt/modules/file.py
@@ -2771,7 +2771,7 @@ def get_managed(
elif source.startswith('/'):
source_sum = get_hash(source)
elif source_hash:
- protos = ('salt', 'http', 'https', 'ftp', 'swift')
+ protos = ('salt', 'http', 'https', 'ftp', 'swift', 's3')
if _urlparse(source_hash).scheme in protos:
# The source_hash is a file on a server
hash_fn = __salt__['cp.cache_file'](source_hash, saltenv) | fix bad merge <I>fc7ec |
diff --git a/lib/missinglink.rb b/lib/missinglink.rb
index <HASH>..<HASH> 100644
--- a/lib/missinglink.rb
+++ b/lib/missinglink.rb
@@ -1,6 +1,5 @@
require "missinglink/engine"
require "missinglink/connection"
-require 'typhoeus'
module Missinglink
include Connection
diff --git a/lib/missinglink/connection.rb b/lib/missinglink/connection.rb
index <HASH>..<HASH> 100644
--- a/lib/missinglink/connection.rb
+++ b/lib/missinglink/connection.rb
@@ -1,3 +1,5 @@
+require 'typhoeus'
+
module Missinglink
module Connection
extend self | move typheous requirement to connection, where it belongs |
diff --git a/lib/fastlane/actions/produce.rb b/lib/fastlane/actions/produce.rb
index <HASH>..<HASH> 100644
--- a/lib/fastlane/actions/produce.rb
+++ b/lib/fastlane/actions/produce.rb
@@ -1,7 +1,7 @@
module Fastlane
module Actions
module SharedValues
-
+ PRODUCE_APPLE_ID = :PRODUCE_APPLE_ID
end
class ProduceAction
@@ -22,7 +22,12 @@ module Fastlane
CredentialsManager::PasswordManager.shared_manager(ENV['PRODUCE_USERNAME']) if ENV['PRODUCE_USERNAME']
Produce::Config.shared_config # to ask for missing information right in the beginning
- Produce::Manager.start_producing
+
+ apple_id = Produce::Manager.start_producing.to_s
+
+
+ Actions.lane_context[SharedValues::PRODUCE_APPLE_ID] = apple_id
+ ENV["PRODUCE_APPLE_ID"] = apple_id
end
end
end | Added storing of produce Apple ID in environment and lane context |
diff --git a/tests/lax_numpy_test.py b/tests/lax_numpy_test.py
index <HASH>..<HASH> 100644
--- a/tests/lax_numpy_test.py
+++ b/tests/lax_numpy_test.py
@@ -203,7 +203,8 @@ JAX_COMPOUND_OP_RECORDS = [
op_record("real", 1, number_dtypes, all_shapes, jtu.rand_some_inf(), []),
op_record("remainder", 2, default_dtypes, all_shapes, jtu.rand_nonzero(), []),
op_record("mod", 2, default_dtypes, all_shapes, jtu.rand_nonzero(), []),
- op_record("sinc", 1, number_dtypes, all_shapes, jtu.rand_default(), ["rev"]),
+ op_record("sinc", 1, number_dtypes, all_shapes, jtu.rand_default(), ["rev"],
+ tolerance={onp.complex64: 1e-5}),
op_record("square", 1, number_dtypes, all_shapes, jtu.rand_default(), ["rev"]),
op_record("sqrt", 1, number_dtypes, all_shapes, jtu.rand_positive(), ["rev"]),
op_record("transpose", 1, all_dtypes, all_shapes, jtu.rand_default(), ["rev"]), | Relax tolerance of np.sinc test. (#<I>) |
diff --git a/tests/rules/test_python_command.py b/tests/rules/test_python_command.py
index <HASH>..<HASH> 100644
--- a/tests/rules/test_python_command.py
+++ b/tests/rules/test_python_command.py
@@ -2,7 +2,7 @@ from thefuck.main import Command
from thefuck.rules.python_command import match, get_new_command
def test_match():
- assert match(Command('', '', 'Permission denied'), None)
+ assert match(Command('temp.py', '', 'Permission denied'), None)
assert not match(Command('', '', ''), None)
def test_get_new_command(): | A special case for 'Permission denied' error msg when trying to execute a
python scripy.
The script does not have execute permission and/or does not start with !#/usr/...
In that case, pre-pend the command with 'python' keyword.
Change-Id: Idf<I>ee9cf0a<I>f<I>c<I>a<I>b2fcedc1e6 |
diff --git a/eventsourcing/application/process.py b/eventsourcing/application/process.py
index <HASH>..<HASH> 100644
--- a/eventsourcing/application/process.py
+++ b/eventsourcing/application/process.py
@@ -238,16 +238,17 @@ class Process(Pipeable, SimpleApplication):
assert isinstance(record_manager, RelationalRecordManager)
event_records += record_manager.to_records(sequenced_items)
- current_max = record_manager.get_max_record_id() or 0
- for event_record in event_records:
- current_max += 1
- event_record.id = current_max
+ if len(event_records):
+ current_max = record_manager.get_max_record_id() or 0
+ for event_record in event_records:
+ current_max += 1
+ event_record.id = current_max
- causal_dependencies = json_dumps(causal_dependencies)
+ if hasattr(record_manager.record_class, 'causal_dependencies'):
+ causal_dependencies = json_dumps(causal_dependencies)
- if hasattr(record_manager.record_class, 'causal_dependencies'):
- for event_record in event_records:
- event_record.causal_dependencies = causal_dependencies
+ # Only need first event to carry the dependencies.
+ event_records[0].causal_dependencies = causal_dependencies
return event_records | Simplified setting of causal dependencies. |
diff --git a/tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php b/tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php
+++ b/tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php
@@ -27,26 +27,6 @@ class CsrfProtectionMiddlewareTest extends TestCase
{
/**
- * setup
- *
- * @return void
- */
- public function setUp()
- {
- parent::setUp();
- }
-
- /**
- * teardown
- *
- * @return void
- */
- public function tearDown()
- {
- parent::tearDown();
- }
-
- /**
* Data provider for HTTP method tests.
*
* HEAD and GET do not populate $_POST or request->data. | Removing method stubs from the CsrfProtectionMiddlewareTest |
diff --git a/master/setup.py b/master/setup.py
index <HASH>..<HASH> 100755
--- a/master/setup.py
+++ b/master/setup.py
@@ -399,7 +399,8 @@ setup_args = {
('buildbot.www.authz', [
'Authz', 'fnmatchStrMatcher', 'reStrMatcher']),
('buildbot.www.authz.roles', [
- 'RolesFromEmails', 'RolesFromGroups', 'RolesFromOwner', 'RolesFromUsername']),
+ 'RolesFromEmails', 'RolesFromGroups', 'RolesFromOwner', 'RolesFromUsername',
+ 'RolesFromDomain']),
('buildbot.www.authz.endpointmatchers', [
'AnyEndpointMatcher', 'StopBuildEndpointMatcher', 'ForceBuildEndpointMatcher',
'RebuildBuildEndpointMatcher', 'AnyControlEndpointMatcher', 'EnableSchedulerEndpointMatcher']), | Add information regarding RolesFromDomain to setup.py. |
diff --git a/lib/index.js b/lib/index.js
index <HASH>..<HASH> 100755
--- a/lib/index.js
+++ b/lib/index.js
@@ -138,7 +138,7 @@ internals.docs = function(settings) {
// will show routes WITH 'mountains' AND 'beach' AND NO 'horses'
if (request.query.tags) {
- tags = request.query.tags.split(',');
+ tags = ['api'].concat(request.query.tags.split(','));
routes = routes.filter(function(route) {
var exit;
@@ -324,7 +324,7 @@ internals.buildAPIInfo = function(settings, apiData, slug) {
"apiVersion": "unknown",
"swaggerVersion": "1.2",
"basePath": settings.basePath,
- "resourcePat11h": '/' + slug,
+ "resourcePath": '/' + slug,
"apis": [],
"models": {}
}; | fix for -tag only; also resourcePat<I>h to reasourcePath |
diff --git a/raven/base.py b/raven/base.py
index <HASH>..<HASH> 100644
--- a/raven/base.py
+++ b/raven/base.py
@@ -53,7 +53,7 @@ class Client(object):
def __init__(self, servers, include_paths=None, exclude_paths=None, timeout=None,
name=None, auto_log_stacks=None, key=None, string_max_length=None,
list_max_length=None, site=None, public_key=None, secret_key=None,
- processors=None, project=1, **kwargs):
+ processors=None, project=None, **kwargs):
# servers may be set to a NoneType (for Django)
if servers and not (key or (secret_key and public_key)):
raise TypeError('You must specify a key to communicate with the remote Sentry servers.')
@@ -73,7 +73,7 @@ class Client(object):
self.site = None
self.public_key = public_key
self.secret_key = secret_key
- self.project = project
+ self.project = int(project or defaults.PROJECT)
self.processors = processors or defaults.PROCESSORS
self.logger = logging.getLogger(__name__) | Handle missing project value with proper default of 1 |
diff --git a/bugzilla/bugzilla3.py b/bugzilla/bugzilla3.py
index <HASH>..<HASH> 100644
--- a/bugzilla/bugzilla3.py
+++ b/bugzilla/bugzilla3.py
@@ -62,7 +62,7 @@ class Bugzilla3(bugzilla.base.BugzillaBase):
def _getbugs(self,idlist):
'''Return a list of dicts of full bug info for each given bug id'''
- r = self._proxy.Bug.get_bugs({'ids':idlist})
+ r = self._proxy.Bug.get_bugs({'ids':idlist, 'permissive': 1})
return [i['internals'] for i in r['bugs']]
def _getbug(self,id):
'''Return a dict of full bug info for the given bug id''' | Add permissive so that invalid bugs don't abort the whole request for bugs.
This matches with the <I>.x python-bugzilla API and seems more generally useful. |
diff --git a/tests/unit/test_ls.py b/tests/unit/test_ls.py
index <HASH>..<HASH> 100644
--- a/tests/unit/test_ls.py
+++ b/tests/unit/test_ls.py
@@ -38,6 +38,7 @@ class LsTests(CliTestCase):
"""
Confirms -F json works with the RecursiveLsResponse
"""
- output = self.run_line("globus ls -r -F json {}:/".format(GO_EP1_ID))
+ output = self.run_line(
+ "globus ls -r -F json {}:/share".format(GO_EP1_ID))
self.assertIn('"DATA":', output)
- self.assertIn('"name": "share/godata/file1.txt"', output)
+ self.assertIn('"name": "godata/file1.txt"', output) | Fix concurrency bug in ls tests |
diff --git a/lib/action_kit_api.rb b/lib/action_kit_api.rb
index <HASH>..<HASH> 100644
--- a/lib/action_kit_api.rb
+++ b/lib/action_kit_api.rb
@@ -7,3 +7,4 @@ require "action_kit_api/data_model"
require "action_kit_api/user"
require "action_kit_api/page"
require "action_kit_api/page_types/petition"
+require "action_kit_api/page_types/signup" | Included SignupPage in the ActionKitApi models |
diff --git a/lib/timing/time_in_zone.rb b/lib/timing/time_in_zone.rb
index <HASH>..<HASH> 100644
--- a/lib/timing/time_in_zone.rb
+++ b/lib/timing/time_in_zone.rb
@@ -5,7 +5,7 @@ module Timing
REGEXP = /[+-]\d\d:?\d\d/
- def_delegators :time, :to_i, :to_f, :to_date, :to_datetime, :<, :<=, :==, :>, :>=, :between?, :eql?, :hash
+ def_delegators :time, :to_i, :to_f, :to_date, :to_datetime, :<, :<=, :==, :>, :>=, :between?, :eql?, :hash, :iso8601
def_delegators :time_with_offset, :year, :month, :day, :hour, :min, :sec, :wday, :yday
attr_reader :zone_offset | Added iso<I> to TimeInZone |
diff --git a/demos/chat/chat.js b/demos/chat/chat.js
index <HASH>..<HASH> 100644
--- a/demos/chat/chat.js
+++ b/demos/chat/chat.js
@@ -1,7 +1,7 @@
// TODO refactor this code into a UI and non-UI part.
var CHANNEL = "#orbited"
-var IRC_SERVER = 'localhost'
+var IRC_SERVER = 'irc.freenode.net'
var IRC_PORT = 6667
var orig_domain = document.domain; | make the chat work on the orbited website |
diff --git a/salt/modules/status.py b/salt/modules/status.py
index <HASH>..<HASH> 100644
--- a/salt/modules/status.py
+++ b/salt/modules/status.py
@@ -11,7 +11,7 @@ import fnmatch
# Import salt libs
import salt.utils
-from salt.utils.network import remote_port_tcp
+from salt.utils.network import remote_port_tcp as _remote_port_tcp
import salt.utils.event
import salt.config
@@ -547,12 +547,20 @@ def version():
def master():
'''
- Fire an event if the minion gets disconnected from its master
- This function is meant to be run via a scheduled job from the minion
+ .. versionadded:: Helium
+
+ Fire an event if the minion gets disconnected from its master. This
+ function is meant to be run via a scheduled job from the minion
+
+ CLI Example:
+
+ .. code-block:: bash
+
+ salt '*' status.master
'''
ip = __salt__['config.option']('master')
port = int(__salt__['config.option']('publish_port'))
- ips = remote_port_tcp(port)
+ ips = _remote_port_tcp(port)
if ip not in ips:
event = salt.utils.event.get_event('minion', opts=__opts__, listen=False) | Fix failing tests for missing docstrings
Also change an imported function to a private function so that it is
not exposed in __salt__. |
diff --git a/src/geo/data-providers/geojson/geojson-data-provider.js b/src/geo/data-providers/geojson/geojson-data-provider.js
index <HASH>..<HASH> 100644
--- a/src/geo/data-providers/geojson/geojson-data-provider.js
+++ b/src/geo/data-providers/geojson/geojson-data-provider.js
@@ -87,7 +87,7 @@ GeoJSONDataProvider.prototype.generateDataForDataview = function (dataview, feat
GeoJSONDataProvider.prototype.applyFilter = function (columnName, filter) {
if (filter instanceof CategoryFilter) {
if (filter.isEmpty()) {
- this._vectorLayerView.applyFilter(this._layerIndex, 'reject', { column: columnName, values: 'all' });
+ this._vectorLayerView.applyFilter(this._layerIndex, 'accept', { column: columnName, values: 'all' });
} else if (filter.get('rejectAll')) {
this._vectorLayerView.applyFilter(this._layerIndex, 'reject', { column: columnName, values: 'all' });
} else if (filter.acceptedCategories.size()) { | Empty filter means all category must be accepted |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ setup(
url='https://github.com/alexandershov/mess',
keywords=['utilities', 'iterators'],
classifiers=[
- 'Programming Language :: Python :: 2.7'
+ 'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3.4'
],
) | Add missing comma
Classifiers were concatenated. |
diff --git a/pkg/api/index.go b/pkg/api/index.go
index <HASH>..<HASH> 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -41,7 +41,7 @@ func (hs *HTTPServer) getProfileNode(c *models.ReqContext) *dtos.NavLink {
}
children = append(children, &dtos.NavLink{
- Text: "Notification history", Id: "profile/notifications", Url: hs.Cfg.AppSubURL + "profile/notifications", Icon: "bell",
+ Text: "Notification history", Id: "profile/notifications", Url: hs.Cfg.AppSubURL + "/profile/notifications", Icon: "bell",
})
if setting.AddChangePasswordLink() { | Profile: Fix nav tree link to notifications (#<I>) |
diff --git a/lib/util/pig-hint.js b/lib/util/pig-hint.js
index <HASH>..<HASH> 100644
--- a/lib/util/pig-hint.js
+++ b/lib/util/pig-hint.js
@@ -29,7 +29,7 @@
if (!context) var context = [];
context.push(tprop);
- completionList = getCompletions(token, context);
+ var completionList = getCompletions(token, context);
completionList = completionList.sort();
//prevent autocomplete for last word, instead show dropdown with one word
if(completionList.length == 1) { | Add missing 'var' declaration. |
diff --git a/lib/puppet/transaction/resource_harness.rb b/lib/puppet/transaction/resource_harness.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/transaction/resource_harness.rb
+++ b/lib/puppet/transaction/resource_harness.rb
@@ -74,7 +74,7 @@ class Puppet::Transaction::ResourceHarness
resource[param] = value
audited << param
else
- resource.notice "Storing newly-audited value #{current[param]} for #{param}"
+ resource.info "Storing newly-audited value #{current[param]} for #{param}"
cache(resource, param, current[param])
end
end
diff --git a/spec/unit/transaction/resource_harness_spec.rb b/spec/unit/transaction/resource_harness_spec.rb
index <HASH>..<HASH> 100755
--- a/spec/unit/transaction/resource_harness_spec.rb
+++ b/spec/unit/transaction/resource_harness_spec.rb
@@ -50,7 +50,7 @@ describe Puppet::Transaction::ResourceHarness do
end
it "should cache and log the current value if no cached values are present" do
- @resource.expects(:notice)
+ @resource.expects(:info)
@harness.copy_audited_parameters(@resource, {:mode => "755"}).should == []
@harness.cached(@resource, :mode).should == "755" | Fix for #<I> "Storing newly-audited value" messages
They're semantically info, not notifications, and now are handled as such. |
diff --git a/lib/ProMotion/repl/repl.rb b/lib/ProMotion/repl/repl.rb
index <HASH>..<HASH> 100644
--- a/lib/ProMotion/repl/repl.rb
+++ b/lib/ProMotion/repl/repl.rb
@@ -6,7 +6,7 @@ if RUBYMOTION_ENV == "development"
if opts == false || opts.to_s.downcase == "off"
"Live reloading of PM screens is now off."
else
- @screen_timer = pm_live_watch("#{pm_app_root_path}/app/screens/**/*.rb", opts) do |reloaded_file, new_code|
+ @screen_timer = pm_live_watch("app/screens/**/*.rb", opts) do |reloaded_file, new_code|
screen_names = pm_parse_screen_names(new_code)
puts "Reloaded #{screen_names.join(", ")} #{screen}." if opts[:debug]
vcs = pm_all_view_controllers(UIApplication.sharedApplication.delegate.window.rootViewController)
@@ -25,7 +25,7 @@ if RUBYMOTION_ENV == "development"
def pm_live_watch(path_query, opts={}, &callback)
# Get list of screen files
puts path_query if opts[:debug]
- live_file_paths = Dir.glob(path_query)
+ live_file_paths = Dir.glob("#{pm_app_root_path}/#{path_query}")
puts live_file_paths if opts[:debug]
live_files = live_file_paths.inject({}) do |out, live_file_path_file| | Move root path into pm_live_watch |
diff --git a/ykman/cli/info.py b/ykman/cli/info.py
index <HASH>..<HASH> 100644
--- a/ykman/cli/info.py
+++ b/ykman/cli/info.py
@@ -51,12 +51,13 @@ def info(ctx):
click.echo('Device capabilities:')
for c in CAPABILITY:
- if c & dev.capabilities:
- if c & dev.enabled:
- status = 'Enabled'
+ if c != CAPABILITY.NFC: # For now, don't expose NFC Capability
+ if c & dev.capabilities:
+ if c & dev.enabled:
+ status = 'Enabled'
+ else:
+ status = 'Disabled'
else:
- status = 'Disabled'
- else:
- status = 'Not available'
+ status = 'Not available'
- click.echo(' {0.name}:\t{1}'.format(c, status))
+ click.echo(' {0.name}:\t{1}'.format(c, status)) | Don't expose NFC capability in CLI |
diff --git a/lib/formatter/response.js b/lib/formatter/response.js
index <HASH>..<HASH> 100644
--- a/lib/formatter/response.js
+++ b/lib/formatter/response.js
@@ -37,31 +37,6 @@ function Result(data, errCode, errMsg) {
this.isFailure = function () {
return !this.isSuccess();
};
-
- // Format data to hash
- this.toHash = function () {
- const s = {};
- if (this.success) {
- s.success = true;
- s.data = this.data;
- } else {
- s.success = false;
- if ( this.data instanceof Object && Object.keys( this.data ).length > 0 ) {
- //Error with data case.
- s.data = this.data;
- }
- s.err = this.err;
- }
-
- return s;
- };
-
- // Render final error or success response
- this.renderResponse = function (res, status) {
- status = status || 200;
- logger.requestCompleteLog(status);
- return res.status(status).json(this.toHash());
- };
}
/** | Removed unnecessary file from response helper |
diff --git a/alot/widgets/globals.py b/alot/widgets/globals.py
index <HASH>..<HASH> 100644
--- a/alot/widgets/globals.py
+++ b/alot/widgets/globals.py
@@ -111,9 +111,6 @@ class CompleteEdit(urwid.Edit):
self.set_edit_text(ctext)
self.set_edit_pos(cpos)
else:
- self.edit_pos += 1
- if self.edit_pos >= len(self.edit_text):
- self.edit_text += ' '
self.completions = None
elif key in ['up', 'down']:
if self.history: | tune CompleteEdit:
don't insert spaces in case the completions set is unary
(no results found) |
diff --git a/user/edit.php b/user/edit.php
index <HASH>..<HASH> 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -100,6 +100,10 @@
//create form
$userform = new user_edit_form();
+ if (empty($user->country)) {
+ // MDL-16308 - we must unset the value here so $CFG->country can be used as default one
+ unset($user->country);
+ }
$userform->set_data($user);
$email_changed = false; | MDL-<I> Use default country instead of empty one when some external auth source (LDAP, POP3 etc) is used. Merged from <I> |
diff --git a/zish/core.py b/zish/core.py
index <HASH>..<HASH> 100644
--- a/zish/core.py
+++ b/zish/core.py
@@ -18,10 +18,13 @@ class ZishException(Exception):
class ZishLocationException(ZishException):
- def __init__(self, line, character, message):
+ def __init__(self, line, character, description):
super().__init__(
"Problem at line " + str(line) + " and character " +
- str(character) + ": " + message)
+ str(character) + ": " + description)
+ self.description = description
+ self.line = line
+ self.character = character
# Single character tokens | Line and character numbers unavailable in errors
Now they're available as the properties 'line' and 'character' on
ZishLocationException. The description of the exception is available as
the property 'description'. |
diff --git a/src/handleActions.js b/src/handleActions.js
index <HASH>..<HASH> 100644
--- a/src/handleActions.js
+++ b/src/handleActions.js
@@ -8,7 +8,7 @@ import { flattenReducerMap } from './flattenUtils';
export default function handleActions(handlers, defaultState, { namespace } = {}) {
invariant(
isPlainObject(handlers),
- 'Expected handlers to be an plain object.'
+ 'Expected handlers to be a plain object.'
);
const flattenedReducerMap = flattenReducerMap(handlers, namespace);
const reducers = ownKeys(flattenedReducerMap).map(type => | Correct the typo in src/handleActions.js (#<I>) |
diff --git a/synapse/tests/test_lib_lmdbslab.py b/synapse/tests/test_lib_lmdbslab.py
index <HASH>..<HASH> 100644
--- a/synapse/tests/test_lib_lmdbslab.py
+++ b/synapse/tests/test_lib_lmdbslab.py
@@ -251,7 +251,7 @@ class LmdbSlabTest(s_t_utils.SynTest):
info0 = guidstor.gen('aaaa')
info0.set('hehe', 20)
- # now imagine we've thrown away info0 and are loading again...
-
+ async with await s_lmdbslab.Slab.anit(path) as slab:
+ guidstor = s_lmdbslab.GuidStor(slab, 'guids')
info1 = guidstor.gen('aaaa')
self.eq(20, info1.get('hehe')) | Actually ensure that GuidStor persists |
diff --git a/src/connect.php b/src/connect.php
index <HASH>..<HASH> 100755
--- a/src/connect.php
+++ b/src/connect.php
@@ -336,9 +336,9 @@ function customMail ($target, $subject, $msg)
$mail->Subject = $subject;
$mail->Body = $msg;
- var_dump ($mail);
-
- $mail->Send ();
+ if(!$mail->send()) {
+ throw new \Exception("Mail could not be send: " . $mail->ErrorInfo);
+ }
}
/* | FIxing phpmailer? I hope? |
diff --git a/lib/deep_cover/auto_run.rb b/lib/deep_cover/auto_run.rb
index <HASH>..<HASH> 100644
--- a/lib/deep_cover/auto_run.rb
+++ b/lib/deep_cover/auto_run.rb
@@ -30,19 +30,16 @@ module DeepCover
def after_tests
use_at_exit = true
if defined?(Minitest)
- puts "Registering with Minitest"
use_at_exit = false
Minitest.after_run { yield }
end
if defined?(Rspec)
use_at_exit = false
- puts "Registering with Rspec"
RSpec.configure do |config|
config.after(:suite) { yield }
end
end
if use_at_exit
- puts "Using at_exit"
at_exit { yield }
end
end | Don't output anything from auto_run.
Some tests might fail just because of that |
diff --git a/graylog2-server/src/main/java/org/graylog2/inputs/syslog/SyslogProcessor.java b/graylog2-server/src/main/java/org/graylog2/inputs/syslog/SyslogProcessor.java
index <HASH>..<HASH> 100644
--- a/graylog2-server/src/main/java/org/graylog2/inputs/syslog/SyslogProcessor.java
+++ b/graylog2-server/src/main/java/org/graylog2/inputs/syslog/SyslogProcessor.java
@@ -120,7 +120,10 @@ public class SyslogProcessor {
* |° loooooooooooooooooooooooooooooooool
* °L| L|
* () ()
- *
+ *
+ *
+ * http://open.spotify.com/track/2ZtQKBB8wDTtPPqDZhy7xZ
+ *
*/
SyslogServerEventIF e; | annotate roflcopter with a proper spotify link |
diff --git a/dallinger/mturk.py b/dallinger/mturk.py
index <HASH>..<HASH> 100644
--- a/dallinger/mturk.py
+++ b/dallinger/mturk.py
@@ -259,6 +259,10 @@ class MTurkService(object):
template = u"https://mturk-requester.{}.amazonaws.com"
return template.format(self.region_name)
+ def account_balance(self):
+ response = self.mturk.get_account_balance()
+ return float(response["AvailableBalance"])
+
def check_credentials(self):
"""Verifies key/secret/host combination by making a balance inquiry"""
try:
diff --git a/tests/test_mturk.py b/tests/test_mturk.py
index <HASH>..<HASH> 100644
--- a/tests/test_mturk.py
+++ b/tests/test_mturk.py
@@ -470,6 +470,10 @@ class TestMTurkService(object):
time.sleep(1)
return True
+ def test_account_balance(self, mturk):
+ balance = mturk.account_balance()
+ assert balance == 10000.0
+
def test_check_credentials_good_credentials(self, mturk):
is_authenticated = mturk.check_credentials()
assert is_authenticated | Implementation of account_balance() for MTurkService |
diff --git a/src/HostBox/Api/PayU/PayU.php b/src/HostBox/Api/PayU/PayU.php
index <HASH>..<HASH> 100644
--- a/src/HostBox/Api/PayU/PayU.php
+++ b/src/HostBox/Api/PayU/PayU.php
@@ -27,6 +27,14 @@ class PayU {
* @param IRequest $request
* @return string
*/
+ public function getRequestUrl(IRequest $request) {
+ return $this->connection->getUrl($request);
+ }
+
+ /**
+ * @param IRequest $request
+ * @return string
+ */
public function rawRequest(IRequest $request) {
return $this->connection->request($request);
} | Add getRequestUrl (required for form action) |
diff --git a/lib/voice/VoiceConnection.js b/lib/voice/VoiceConnection.js
index <HASH>..<HASH> 100644
--- a/lib/voice/VoiceConnection.js
+++ b/lib/voice/VoiceConnection.js
@@ -312,12 +312,14 @@ class VoiceConnection extends EventEmitter {
break;
}
case VoiceOPCodes.DISCONNECT: {
- // opusscript requires manual cleanup
- if(this.opus[packet.d.user_id] && this.opus[packet.d.user_id].delete) {
- this.opus[packet.d.user_id].delete();
- }
+ if(this.opus) {
+ // opusscript requires manual cleanup
+ if(this.opus[packet.d.user_id] && this.opus[packet.d.user_id].delete) {
+ this.opus[packet.d.user_id].delete();
+ }
- delete this.opus[packet.d.user_id];
+ delete this.opus[packet.d.user_id];
+ }
/**
* Fired when a user disconnects from the voice server | Fix crash when handling voice user disconnect (#<I>) |
diff --git a/ipmag.py b/ipmag.py
index <HASH>..<HASH> 100755
--- a/ipmag.py
+++ b/ipmag.py
@@ -32,6 +32,21 @@ def igrf(input_list):
return Dir
+def fisher_mean(dec,inc):
+ """
+ Calculates the Fisher mean and associated parameters from a list of
+ declination values and a separate list of inclination values (which are
+ in order such that they are paired with one another)
+
+ Arguments
+ ----------
+ dec : list with declination values
+ inc : list with inclination values
+ """
+ di_block = make_di_block(dec,inc)
+ return pmag.fisher_mean(di_block)
+
+
def fishrot(k=20,n=100,Dec=0,Inc=90):
"""
Generates Fisher distributed unit vectors from a specified distribution | add ipmag fisher_mean function that accepts list of dec and list of inc instead of di_block |
diff --git a/src/SearchParameters/index.js b/src/SearchParameters/index.js
index <HASH>..<HASH> 100644
--- a/src/SearchParameters/index.js
+++ b/src/SearchParameters/index.js
@@ -52,7 +52,7 @@ var RefinementList = require('./RefinementList');
* for the properties of a new SearchParameters
* @see SearchParameters.make
* @example <caption>SearchParameters of the first query in
- * <a href="http://demos.algolia.com/instant-search-demo">the instant search demo</a></caption>
+ * <a href="http://demos.algolia.com/instant-search-demo/">the instant search demo</a></caption>
{
"query": "",
"disjunctiveFacets": [ | docs(SearchParameters): fix broken link |
diff --git a/pylint_django/transforms/transforms/django_core_handlers_wsgi.py b/pylint_django/transforms/transforms/django_core_handlers_wsgi.py
index <HASH>..<HASH> 100644
--- a/pylint_django/transforms/transforms/django_core_handlers_wsgi.py
+++ b/pylint_django/transforms/transforms/django_core_handlers_wsgi.py
@@ -3,3 +3,4 @@ from django.core.handlers.wsgi import WSGIRequest as WSGIRequestOriginal
class WSGIRequest(WSGIRequestOriginal):
status_code = None
+ content = '' | Add content field to WSGIRequest proxy |
diff --git a/packages/grpc-native-core/src/client_interceptors.js b/packages/grpc-native-core/src/client_interceptors.js
index <HASH>..<HASH> 100644
--- a/packages/grpc-native-core/src/client_interceptors.js
+++ b/packages/grpc-native-core/src/client_interceptors.js
@@ -51,7 +51,7 @@
* `halfClose(next)`
* * To continue, call next().
*
- * `cancel(message, next)`
+ * `cancel(next)`
* * To continue, call next().
*
* A listener is a POJO with one or more of the following methods:
@@ -109,7 +109,7 @@
* halfClose: function(next) {
* next();
* },
- * cancel: function(message, next) {
+ * cancel: function(next) {
* next();
* }
* }); | message parameter was removed from cancel requester description |
diff --git a/examples/push_pull.py b/examples/push_pull.py
index <HASH>..<HASH> 100755
--- a/examples/push_pull.py
+++ b/examples/push_pull.py
@@ -3,7 +3,7 @@
"""
Example txzmq client.
- examples/push_pull.py --method=bind --endpoint=ipc:///tmp/sock
+ examples/push_pull.py --method=connect --endpoint=ipc:///tmp/sock
--mode=push
examples/push_pull.py --method=bind --endpoint=ipc:///tmp/sock | Changed arguments to the example run commands so that push would actually work :) |
diff --git a/nanoplot/version.py b/nanoplot/version.py
index <HASH>..<HASH> 100644
--- a/nanoplot/version.py
+++ b/nanoplot/version.py
@@ -1 +1 @@
-__version__ = "1.29.2"
+__version__ = "1.29.3"
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
'matplotlib>=3.1.3',
'nanoget>=1.9.0',
'nanomath>=0.23.1',
- "pauvre==0.1.86",
+ "pauvre==0.2.0",
'plotly>=4.1.0',
],
package_data={'NanoPlot': []}, | changing minimal version of pauvre to <I>
reported in <URL> |
diff --git a/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java b/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
index <HASH>..<HASH> 100644
--- a/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
+++ b/platform/android/Rhodes/src/com/rhomobile/rhodes/webview/GoogleWebView.java
@@ -72,7 +72,13 @@ public class GoogleWebView implements IRhoWebView {
// @Override
// public void run() {
Logger.I(TAG, "Web settings is applying now >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-
+ try{
+ WebSettings webSettings = mWebView.getSettings();
+ webSettings.setStandardFontFamily(RhoConf.getString("fontFamily"));
+ }
+ catch(Exception excp){
+
+ }
double z = getConfig().getDouble(WebViewConfig.PAGE_ZOOM);
mWebView.setInitialScale((int)(z * 100));
mWebView.setVerticalScrollBarEnabled(true); | Code fix for SR id: EMBPD<I> (SPR <I>)
Adding a fontfamily attribute to read from Config.xml file. Whatever font family is specified in Config.xml file, same will be reflected in EB webview. |
diff --git a/util/server.js b/util/server.js
index <HASH>..<HASH> 100644
--- a/util/server.js
+++ b/util/server.js
@@ -140,7 +140,7 @@ server.serveTestSuite = function(expressApp, globPattern, options) {
}
// NOTE: adding this file first as this will launch
// our customized version of tape for the browser.
- b.add(path.join(cwd, 'test', 'app.js'));
+ b.add(path.join(__dirname, '..', 'test', 'app.js'));
b.add(testfiles.map(function(file) {
return path.join(cwd, file);
})) | Use correct path when serving test suite. |
diff --git a/salt/modules/file.py b/salt/modules/file.py
index <HASH>..<HASH> 100644
--- a/salt/modules/file.py
+++ b/salt/modules/file.py
@@ -4063,8 +4063,8 @@ def check_file_meta(
tmp = salt.utils.mkstemp(text=True)
if salt.utils.is_windows():
contents = os.linesep.join(contents.splitlines())
- with salt.utils.fopen(tmp, 'wb') as tmp_:
- tmp_.write(salt.utils.to_bytes(str(contents)))
+ with salt.utils.fopen(tmp, 'w') as tmp_:
+ tmp_.write(str(contents))
# Compare the static contents with the named file
with salt.utils.fopen(tmp, 'r') as src:
slines = src.readlines() | Change file.check_file_meta write mode to "w"
In order to be consistent with how `file.manage_file` writes a file,
we make `file.check_file_meta` also write the file as "w" instead of "wb".
This is necessary so that diff functionality correctly identifies
identical files when the source file is multi-line. |
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ required = [
setup(
name="Farnsworth",
- version="1.2.1",
+ version="2.0.0",
author="Karandeep Nagra",
url="https://github.com/knagra/farnsworth",
author_email="karandeepsnagra@gmail.com", | Bumped the version for when we eventually release dev |
diff --git a/lxd/storage/drivers/utils.go b/lxd/storage/drivers/utils.go
index <HASH>..<HASH> 100644
--- a/lxd/storage/drivers/utils.go
+++ b/lxd/storage/drivers/utils.go
@@ -681,13 +681,13 @@ func copyDevice(inputPath string, outputPath string) error {
}
// Check for Direct I/O support.
- from, err := os.OpenFile(inputPath, unix.O_DIRECT, 0)
+ from, err := os.OpenFile(inputPath, unix.O_DIRECT|unix.O_RDONLY, 0)
if err == nil {
cmd = append(cmd, "iflag=direct")
from.Close()
}
- to, err := os.OpenFile(outputPath, unix.O_DIRECT, 0)
+ to, err := os.OpenFile(outputPath, unix.O_DIRECT|unix.O_RDONLY, 0)
if err == nil {
cmd = append(cmd, "oflag=direct")
to.Close() | lxd/storage/drivers/utils: Update copyDevice to open files in read only mode |
diff --git a/pkg/resource/properties.go b/pkg/resource/properties.go
index <HASH>..<HASH> 100644
--- a/pkg/resource/properties.go
+++ b/pkg/resource/properties.go
@@ -360,7 +360,11 @@ func NewPropertyValue(v interface{}) PropertyValue {
return NewPropertyArray(arr)
case reflect.Ptr:
// If a pointer, recurse and return the underlying value.
- return NewPropertyValue(rv.Elem().Interface())
+ if rv.IsNil() {
+ return NewPropertyNull()
+ } else {
+ return NewPropertyValue(rv.Elem().Interface())
+ }
case reflect.Struct:
obj := NewPropertyMap(rv.Interface())
return NewPropertyObject(obj) | Tolerate nils in output property marshaling |
diff --git a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
index <HASH>..<HASH> 100644
--- a/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
+++ b/launcher/src/main/java/io/snappydata/tools/QuickLauncher.java
@@ -124,6 +124,15 @@ class QuickLauncher extends LauncherBase {
// add java path to command-line first
commandLine.add(System.getProperty("java.home") + "/bin/java");
commandLine.add("-server");
+ // https://github.com/airlift/jvmkill is added to libgemfirexd.so
+ // adding agentpath helps kill jvm in case of OOM. kill -9 is not
+ // used as it fails in certain cases
+ String arch = System.getProperty("os.arch");
+ if(arch.contains("64") || arch.contains("s390x")){
+ commandLine.add("-agentpath:" + snappyHome + "/jars/libgemfirexd64.so");
+ }else{
+ commandLine.add("-agentpath:" + snappyHome + "/jars/libgemfirexd.so");
+ }
// get the startup options and command-line arguments (JVM arguments etc)
HashMap<String, Object> options = getStartOptions(args, snappyHome, commandLine, env); | adding commandline arg to kill on OOM (#<I>)
* adding commandline arg to kill on OOM
* checking if system is <I> bit to apply right libgemfirexd<<I>/<I>>.so |
diff --git a/lib/scarlet/slideshow.rb b/lib/scarlet/slideshow.rb
index <HASH>..<HASH> 100644
--- a/lib/scarlet/slideshow.rb
+++ b/lib/scarlet/slideshow.rb
@@ -32,7 +32,7 @@ module Scarlet
enumerable.lines.each do |line|
if line.include? "!SLIDE"
slides << Scarlet::Slide.new
- slides.last.classes = line.delete("!SLIDE").strip
+ slides.last.classes = line.gsub("!SLIDE", "").strip
else
next if slides.empty?
slides.last.text << line
@@ -41,4 +41,4 @@ module Scarlet
return slides
end
end
-end
\ No newline at end of file
+end | Use gsub instead of delete so that any overlapping characters with the string 'SLIDES' don't get deleted as well |
diff --git a/data/handleDB.php b/data/handleDB.php
index <HASH>..<HASH> 100644
--- a/data/handleDB.php
+++ b/data/handleDB.php
@@ -910,5 +910,5 @@ class DbHandleApplication extends Application
}
}
-$application = new DbHandleApplication('Database handler for CompatInfo', '1.21.0');
+$application = new DbHandleApplication('Database handler for CompatInfo', '1.22.0');
$application->run(); | Bump new version <I> |
diff --git a/lib/codesake/dawn/version.rb b/lib/codesake/dawn/version.rb
index <HASH>..<HASH> 100644
--- a/lib/codesake/dawn/version.rb
+++ b/lib/codesake/dawn/version.rb
@@ -1,5 +1,5 @@
module Codesake
module Dawn
- VERSION = "0.70"
+ VERSION = "0.72"
end
end | Version: <I>
Some bug fixing |
diff --git a/app/models/repository.rb b/app/models/repository.rb
index <HASH>..<HASH> 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -304,7 +304,9 @@ class Repository < ActiveRecord::Base
def assert_deletable
if self.environment.library? && self.content_view.default?
- if self.custom? && self.deletable?
+ if self.environment.organization.being_deleted?
+ return true
+ elsif self.custom? && self.deletable?
return true
elsif !self.custom? && self.redhat_deletable?
return true | <I> - Fixed a repo delete issue
Prior to this commit there was logic that said something along the lines
of 'Do not delete a RH repo unless its disabled'. Due to this when an org
was getting deleted, if there were any 'enabled' redhat repos in the org
there would be dangling repositories with nil references.
This commit adds an additional clause that says, "Allow deletion of the
redhat repo if org is getting deleted". |
diff --git a/test/Organizer/OrganizerLDProjectorTest.php b/test/Organizer/OrganizerLDProjectorTest.php
index <HASH>..<HASH> 100644
--- a/test/Organizer/OrganizerLDProjectorTest.php
+++ b/test/Organizer/OrganizerLDProjectorTest.php
@@ -162,7 +162,7 @@ class OrganizerLDProjectorTest extends \PHPUnit_Framework_TestCase
1,
new Metadata(),
$placeCreated,
- DateTime::fromString($created)
+ BroadwayDateTime::fromString($created)
)
);
} | III-<I> Fixed organizer ld projector unit test . |
diff --git a/gobblin-data-management/src/test/java/org/apache/gobblin/data/management/retention/CleanableMysqlDatasetStoreDatasetTest.java b/gobblin-data-management/src/test/java/org/apache/gobblin/data/management/retention/CleanableMysqlDatasetStoreDatasetTest.java
index <HASH>..<HASH> 100644
--- a/gobblin-data-management/src/test/java/org/apache/gobblin/data/management/retention/CleanableMysqlDatasetStoreDatasetTest.java
+++ b/gobblin-data-management/src/test/java/org/apache/gobblin/data/management/retention/CleanableMysqlDatasetStoreDatasetTest.java
@@ -112,7 +112,7 @@ public class CleanableMysqlDatasetStoreDatasetTest {
* Test cleanup of the job state store
* @throws IOException
*/
- @Test
+ @Test(enabled = false)
public void testCleanJobStateStore() throws IOException {
JobState jobState = new JobState(TEST_JOB_NAME1, getJobId(TEST_JOB_ID, 1));
jobState.setId(getJobId(TEST_JOB_ID, 1));
@@ -176,7 +176,7 @@ public class CleanableMysqlDatasetStoreDatasetTest {
*
* @throws IOException
*/
- @Test
+ @Test(enabled = false)
public void testCleanDatasetStateStore() throws IOException {
JobState.DatasetState datasetState = new JobState.DatasetState(TEST_JOB_NAME1, getJobId(TEST_JOB_ID, 1)); | Disable CleanableMysqlDatasetStoreDatasetTest unit tests, already dropped from Continuous Ingetration. (#<I>)
* Disable CleanableMysqlDatasetStoreDatasetTest unit tests, already dropped from Continuous Ingetration. |
diff --git a/contrib/externs/angular-material.js b/contrib/externs/angular-material.js
index <HASH>..<HASH> 100644
--- a/contrib/externs/angular-material.js
+++ b/contrib/externs/angular-material.js
@@ -863,7 +863,7 @@ md.$panel.prototype.create = function(opt_config) {};
/**
* @param {!md.$panel.config=} opt_config
- * @return {!md.$panel.MdPanelRef}
+ * @return {!angular.$q.Promise<!md.$panel.MdPanelRef>}
*/
md.$panel.prototype.open = function(opt_config) {}; | In the md-panel directive the "open" function now returns a "mdPanelRef" wrapped in a promise. Updating externs to reflect that.
-------------
Created by MOE: <URL> |
diff --git a/consumer.go b/consumer.go
index <HASH>..<HASH> 100644
--- a/consumer.go
+++ b/consumer.go
@@ -106,7 +106,7 @@ func (c *Consumer) Messages() <-chan *sarama.ConsumerMessage { return c.messages
// Partitions returns the read channels for individual partitions of this broker.
//
-// This will channel will only return if Config.Group.Mode option is set to
+// This channel will only return if Config.Group.Mode option is set to
// ConsumerModePartitions.
//
// The Partitions() channel must be listened to for the life of this consumer; | Fix typo in godoc (#<I>)
This patch fixes small typo in godoc. |
diff --git a/doc/scripts/header.js b/doc/scripts/header.js
index <HASH>..<HASH> 100644
--- a/doc/scripts/header.js
+++ b/doc/scripts/header.js
@@ -17,7 +17,7 @@ domReady(() => {
header.insertBefore(projectname, header.firstChild);
const testlink = document.querySelector('header > a[data-ice="testLink"]');
- testlink.href = 'https://coveralls.io/github/failure-abstraction/error';
+ testlink.href = 'https://app.codecov.io/gh/failure-abstraction/error';
testlink.target = '_BLANK';
const searchBox = document.querySelector('.search-box'); | :robot: docs: Use codecov as test link.
These changes were automatically generated by a transform whose code can be found at:
- <URL> |
diff --git a/src/main/java/org/jsoup/helper/HttpConnection.java b/src/main/java/org/jsoup/helper/HttpConnection.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/jsoup/helper/HttpConnection.java
+++ b/src/main/java/org/jsoup/helper/HttpConnection.java
@@ -662,6 +662,7 @@ public class HttpConnection implements Connection {
if (status != HTTP_TEMP_REDIR) {
req.method(Method.GET); // always redirect with a get. any data param from original req are dropped.
req.data().clear();
+ req.requestBody(null);
}
String location = res.header(LOCATION); | Fix #<I>
Set request body to null when doing a redirect |
diff --git a/ospd/misc.py b/ospd/misc.py
index <HASH>..<HASH> 100644
--- a/ospd/misc.py
+++ b/ospd/misc.py
@@ -295,7 +295,7 @@ class ScanCollection(object):
t_prog = sum(host_progresses.values()) / total_hosts
except ZeroDivisionError:
LOGGER.error(
- "Zero division error in ", get_target_progress.__name__
+ "Zero division error in %s", self.get_target_progress.__name__
)
raise
return t_prog | Fix error log
Add formatting placeholder and use correct reference to the method. |
diff --git a/trafaret/__init__.py b/trafaret/__init__.py
index <HASH>..<HASH> 100644
--- a/trafaret/__init__.py
+++ b/trafaret/__init__.py
@@ -33,7 +33,8 @@ Look at doctests for usage examples
__all__ = ("DataError", "Trafaret", "Any", "Int", "String",
"List", "Dict", "Or", "Null", "Float", "Enum", "Callable",
- "Call", "Forward", "Bool", "Type", "Mapping", "guard", "Key")
+ "Call", "Forward", "Bool", "Type", "Mapping", "guard", "Key",
+ "Tuple", "Atom", "Email", "URL")
ENTRY_POINT = 'trafaret' | missing trafarets added to __all__ |
diff --git a/skyfield/tests/test_planetarylib.py b/skyfield/tests/test_planetarylib.py
index <HASH>..<HASH> 100644
--- a/skyfield/tests/test_planetarylib.py
+++ b/skyfield/tests/test_planetarylib.py
@@ -24,8 +24,8 @@ def test_frame_rotation_matrices():
[ 0.0016578894811168, -0.3730107540024127, 0.9278255379116378],
]
r = frame.rotation_at(ts.tdb_jd(tdb))
- delta = r - spiceypy_matrix
- assert (delta < 2e-16).all() # nearly float64 precision
+ delta = abs(r - spiceypy_matrix)
+ assert (delta < 6e-17).all() # nearly float64 precision
# Second, a moment when the angle W is more than 2500 radians.
@@ -36,8 +36,7 @@ def test_frame_rotation_matrices():
[-0.0223084753202375, -0.4115854446818337, 0.9110981032001678],
]
r = frame.rotation_at(ts.tdb_jd(tdb))
- delta = r - spiceypy_matrix
- print(delta)
+ delta = abs(r - spiceypy_matrix)
assert (delta < 2e-13).all() # a few digits are lost in large W radians
def test_rotating_vector_into_frame(): | Tighten a test tolerance, thanks to jplephem <I> |
diff --git a/csg/__init__.py b/csg/__init__.py
index <HASH>..<HASH> 100644
--- a/csg/__init__.py
+++ b/csg/__init__.py
@@ -1 +1 @@
-__version__ = 0.2
+__version__ = 0.2.2 | also updating __version__ |
diff --git a/astrobase/lcmath.py b/astrobase/lcmath.py
index <HASH>..<HASH> 100644
--- a/astrobase/lcmath.py
+++ b/astrobase/lcmath.py
@@ -1342,6 +1342,11 @@ def phase_bin_magseries_with_errs(phases, mags, errs,
The minimum number of elements required per bin to include it in the
output.
+ weights : np.array or None
+ Optional weight vector to be applied during binning. If if is passed,
+ `np.average` is used to bin, rather than `np.median`. A good choice
+ would be to pass weights=1/errs**2, to weight by the inverse variance.
+
Returns
------- | add weights kwarg to docstring |
diff --git a/coursera/coursera_dl.py b/coursera/coursera_dl.py
index <HASH>..<HASH> 100755
--- a/coursera/coursera_dl.py
+++ b/coursera/coursera_dl.py
@@ -276,11 +276,11 @@ def get_config_paths(config_name, user_specified_path=None):
env_dirs = []
for v in env_vars:
- dir = ''.join(map(getenv_or_empty, v))
- if not dir:
+ directory = ''.join(map(getenv_or_empty, v))
+ if not directory:
logging.debug('Environment var(s) %s not defined, skipping', v)
else:
- env_dirs.append(dir)
+ env_dirs.append(directory)
additional_dirs = ["C:", ""]
@@ -288,8 +288,8 @@ def get_config_paths(config_name, user_specified_path=None):
leading_chars = [".", "_"]
- res = [''.join([dir, os.sep, lc, config_name])
- for dir in all_dirs
+ res = [''.join([directory, os.sep, lc, config_name])
+ for directory in all_dirs
for lc in leading_chars]
return res
@@ -460,6 +460,7 @@ def transform_preview_url(a):
else:
return None
+
def get_video(url):
"""
Parses a Coursera video page | Rename variables to not redefine Python builtins. |
diff --git a/php/Exchange.php b/php/Exchange.php
index <HASH>..<HASH> 100644
--- a/php/Exchange.php
+++ b/php/Exchange.php
@@ -531,11 +531,11 @@ class Exchange {
}
public static function urlencode ($string) {
- return http_build_query ($string);
+ return http_build_query ($string,"","&");
}
public static function rawencode ($string) {
- return urldecode (http_build_query ($string));
+ return urldecode (http_build_query ($string,"","&"));
}
public static function encode_uri_component ($string) { | http_build_query third parameter is based on a php.ini setting that could be changed by the user
The third parameter of http_build_query, if omitted, defaults to a setting in php.ini which can be changed by user's code.
So it should not be relied upon, but instead it should be explicitly set to "&" as many exchanges DO NOT accept & or other separators. |
diff --git a/packages/react-server-cli/src/compileClient.js b/packages/react-server-cli/src/compileClient.js
index <HASH>..<HASH> 100755
--- a/packages/react-server-cli/src/compileClient.js
+++ b/packages/react-server-cli/src/compileClient.js
@@ -129,7 +129,7 @@ function statsToManifest(stats) {
if (/\.css$/.test(chunk.files[i])) {
// the CSS file is probably last file in the array, unless there have been hot updates for the JS
// which show up in the array prior to the CSS file.
- cssChunksByName[chunk.name] = chunk.files[chunk.files.length - 1];
+ cssChunksByName[chunk.name] = chunk.files[i];
break;
}
} | Minor fix to use the for loop logic instead of .length - 1. |
diff --git a/test/Reporters/opendiffReporterTests.js b/test/Reporters/opendiffReporterTests.js
index <HASH>..<HASH> 100644
--- a/test/Reporters/opendiffReporterTests.js
+++ b/test/Reporters/opendiffReporterTests.js
@@ -19,6 +19,12 @@ describe('Reporter', function () {
assert.ok(command.toLowerCase().indexOf("opendiff") >= 0);
assert.deepEqual(args, [receivedFile, approvedFile]);
+
+
+ return {
+ stdout: { on: function () {} },
+ stderr: { on: function () {} }
+ };
});
}); | fix test on mac for opendiff |
diff --git a/server/viewEngine.js b/server/viewEngine.js
index <HASH>..<HASH> 100644
--- a/server/viewEngine.js
+++ b/server/viewEngine.js
@@ -86,7 +86,7 @@ ViewEngine.prototype.getBootstrappedData = function getBootstrappedData(locals,
var tempObject = {};
tempObject[key] = value;
- _.extend(bootstrappedData, scope.getBootstrappedData(tempObject, app));
+ _.defaults(bootstrappedData, scope.getBootstrappedData(tempObject, app));
}
})
} | changed the higher level properties to be more important |
diff --git a/lib/qx/tool/cli/commands/Clean.js b/lib/qx/tool/cli/commands/Clean.js
index <HASH>..<HASH> 100644
--- a/lib/qx/tool/cli/commands/Clean.js
+++ b/lib/qx/tool/cli/commands/Clean.js
@@ -79,7 +79,9 @@ qx.Class.define("qx.tool.cli.commands.Clean", {
for( let cacheFile of ["db.json","resource-db.json"]){
let dbPath = path.join( process.cwd(), cacheFile );
if( verbose ) console.info(`Removing ${cacheFile}...`);
- await fs.unlinkAsync(dbPath);
+ if (await fs.existsAsync(dbPath)) {
+ await fs.unlinkAsync(dbPath);
+ }
}
}
} | Suppress warnings in 'qx clean' if files to be deleted don't exist |
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index <HASH>..<HASH> 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -89,18 +89,28 @@ module ActionController #:nodoc:
def session
return @session unless @session.nil?
+
begin
@session = (@session_options == false ? {} : CGI::Session.new(@cgi, session_options_with_string_keys))
@session["__valid_session"]
return @session
rescue ArgumentError => e
- @session.delete if @session
- raise(
- ActionController::SessionRestoreError,
- "Session contained objects where the class definition wasn't available. " +
- "Remember to require classes for all objects kept in the session. " +
- "The session has been deleted. (Original exception: #{e.message} [#{e.class}])"
- )
+ if e.message =~ %r{undefined class/module (\w+)}
+ begin
+ Module.const_missing($1)
+ rescue LoadError, NameError => e
+ raise(
+ ActionController::SessionRestoreError,
+ "Session contained objects where the class definition wasn't available. " +
+ "Remember to require classes for all objects kept in the session. " +
+ "(Original exception: #{e.message} [#{e.class}])"
+ )
+ end
+
+ retry
+ else
+ raise
+ end
end
end | Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers
git-svn-id: <URL> |
diff --git a/config/routes.rb b/config/routes.rb
index <HASH>..<HASH> 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,7 @@
Ecm::Tags::Engine.routes.draw do
- resources :tag_searchs, only: [:new, :create]
+ resources :tag_searchs, only: [:new, :create] do
+ get '/', on: :collection, to: "tag_searchs#create"
+ end
root to: 'tag_searchs#new'
end | Added get route to search#create |
diff --git a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java
index <HASH>..<HASH> 100644
--- a/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java
+++ b/languagetool-language-modules/en/src/main/java/org/languagetool/rules/en/AbstractEnglishSpellerRule.java
@@ -640,6 +640,7 @@ public abstract class AbstractEnglishSpellerRule extends MorfologikSpellerRule {
s.put("continuesly", Arrays.asList("continuously"));
s.put("humain", Arrays.asList("humane", "human"));
s.put("protene", Arrays.asList("protein"));
+ s.put("throught", Arrays.asList("thought", "through", "throat"));
return s;
} | [en] spellings for "throught" |
diff --git a/test/specs/dom_components/model/Symbols.js b/test/specs/dom_components/model/Symbols.js
index <HASH>..<HASH> 100644
--- a/test/specs/dom_components/model/Symbols.js
+++ b/test/specs/dom_components/model/Symbols.js
@@ -270,5 +270,18 @@ describe('Symbols', () => {
const innerSymb = allInst.map(i => getInnerComp(i, 1));
expect(clonedSymb.__getSymbols()).toEqual(innerSymb);
});
+
+ test('Cloning a component in a symbol, reflects changes to all instances', () => {
+ const clonedSymb = duplicate(getInnerComp(symbol));
+ const cloned = getInnerComp(comp, 1);
+ const newLen = symbol.components().length;
+ // As above
+ expect(newLen).toBe(compInitChild + 1);
+ expect(cloned.__getSymbol()).toBe(clonedSymb);
+ all.forEach(cmp => expect(cmp.components().length).toBe(newLen));
+ allInst.forEach(cmp => expect(getInnSymbol(cmp, 1)).toBe(clonedSymb));
+ const innerSymb = allInst.map(i => getInnerComp(i, 1));
+ expect(clonedSymb.__getSymbols()).toEqual(innerSymb);
+ });
});
}); | Add test for cloning components inside the main symbol |
diff --git a/webpack.config.node.js b/webpack.config.node.js
index <HASH>..<HASH> 100644
--- a/webpack.config.node.js
+++ b/webpack.config.node.js
@@ -83,11 +83,6 @@ const webpackConfig = {
module: {
rules: [
{
- test: /extensions[/\\]index/,
- exclude: path.join( __dirname, 'node_modules' ),
- loader: path.join( __dirname, 'server', 'bundler', 'extensions-loader' ),
- },
- {
include: path.join( __dirname, 'client/sections.js' ),
use: {
loader: path.join( __dirname, 'server', 'bundler', 'sections-loader' ), | Remove extensions loader from server config (#<I>)
In #<I> we removed the extensions loader from Calypso. We didn't
remove the configuration for it from the `webpack.config.node.js` file.
It probably didn't break becuase `extensions/index` wasn't being loaded
on the server and so the rule didn't match and the loader wasn't
requested.
This patch removes the reference that should have disappered in that PR. |
diff --git a/plugins/UsersManager/javascripts/usersSettings.js b/plugins/UsersManager/javascripts/usersSettings.js
index <HASH>..<HASH> 100644
--- a/plugins/UsersManager/javascripts/usersSettings.js
+++ b/plugins/UsersManager/javascripts/usersSettings.js
@@ -24,7 +24,7 @@ function sendUserSettingsAJAX() {
var defaultReport = $('input[name=defaultReport]:checked').val();
if (defaultReport == 1) {
- defaultReport = $('#userSettingsTable').find('.custom_select_main_link').attr('siteid');
+ defaultReport = $('#userSettingsTable').find('.custom_select_main_link').attr('data-siteid');
}
var postParams = {};
postParams.alias = alias; | Fix User settings save regression: 'defaultReport was not set in query'. |
diff --git a/lib/geocoder/lookups/esri.rb b/lib/geocoder/lookups/esri.rb
index <HASH>..<HASH> 100644
--- a/lib/geocoder/lookups/esri.rb
+++ b/lib/geocoder/lookups/esri.rb
@@ -48,14 +48,17 @@ module Geocoder::Lookup
end
def token
- if configuration[:token] && configuration[:token].active? # if we have a token, use it
- configuration[:token].to_s
- elsif configuration.api_key # generate a new token if we have credentials
- token_instance = Geocoder::EsriToken.generate_token(*configuration.api_key)
- Geocoder.configure(:esri => Geocoder.config[:esri].merge({:token => token_instance}))
- token_instance.to_s
- end
+ fetch_and_save_token! if !valid_token_configured? and configuration.api_key
+ configuration[:token].to_s unless configuration[:token].nil?
+ end
+
+ def valid_token_configured?
+ !configuration[:token].nil? and configuration[:token].active?
end
+ def fetch_and_save_token!
+ token_instance = Geocoder::EsriToken.generate_token(*configuration.api_key)
+ Geocoder.configure(:esri => {:token => token_instance})
+ end
end
end | Refactor ESRI lookup's `token` method.
This should improve readability and make testing easier as it separates
the various tasks into separate methods. |
diff --git a/src/neuron/dom/event.js b/src/neuron/dom/event.js
index <HASH>..<HASH> 100644
--- a/src/neuron/dom/event.js
+++ b/src/neuron/dom/event.js
@@ -306,6 +306,10 @@ DOM.Events = Events;
/**
change log:
+ 2011-09-12 Kael:
+ TODO:
+ - A.
+
2011-09-10 Kael:
- basic functionalities
diff --git a/src/neuron/dom/manipulate.js b/src/neuron/dom/manipulate.js
index <HASH>..<HASH> 100644
--- a/src/neuron/dom/manipulate.js
+++ b/src/neuron/dom/manipulate.js
@@ -374,6 +374,18 @@ METHODS.text = {
};
+// TODO
+// .val() methods
+METHODS.val = {
+ SET: function(value){
+ //
+ },
+
+ GET: function(){
+ }
+};
+
+
DOM.extend({
addClass: addClass,
@@ -461,6 +473,11 @@ DOM._overload = overloadDOMGetterSetter;
/**
change log:
+ 2011-09-12 Kael:
+ TODO:
+ A. review .inject and .grab. whether should only deal with the first element of all matches
+ B. deal with more elements of tables, such as caption, colgroup, etc
+
2011-09-08 Kael:
- improve stability of function overloadDOMGetterSetter
- add method hooks, DOM.methods | dom: add comments; actually nothing |
diff --git a/src/Silex/Console/Command/Cron/RunCommand.php b/src/Silex/Console/Command/Cron/RunCommand.php
index <HASH>..<HASH> 100644
--- a/src/Silex/Console/Command/Cron/RunCommand.php
+++ b/src/Silex/Console/Command/Cron/RunCommand.php
@@ -313,6 +313,15 @@ class Task
}
$this->nextTimestamp = $next;
- $callback($this);
+
+ try {
+ $callback($this);
+ } catch (\Exception $ex) {
+ $this->output->writeln(sprintf('<error>%s in %s:%s</error>', $ex->getMessage(), $ex->getFile(), $ex->getLine()));
+
+ if ($this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE) {
+ $this->output->writeln(sprintf('<error>%s</error>', $ex->getTraceAsString()));
+ }
+ }
}
} | Add exception handling to cron command execution |
diff --git a/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java b/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java
+++ b/src/main/java/com/lazerycode/jmeter/mojo/ConfigureJMeterMojo.java
@@ -132,7 +132,7 @@ public class ConfigureJMeterMojo extends AbstractJMeterMojo {
* <false>
* <downloadJMeterDependencies>
*/
- @Parameter(defaultValue = "false")
+ @Parameter(defaultValue = "true")
protected boolean downloadJMeterDependencies;
/** | ConfigureJMeterMojo: download jmeter dependencies to Support upcoming
JMeter <I>
This comments #<I> |
diff --git a/hugolib/site.go b/hugolib/site.go
index <HASH>..<HASH> 100644
--- a/hugolib/site.go
+++ b/hugolib/site.go
@@ -269,6 +269,7 @@ func (s *Site) Process() (err error) {
return
}
s.prepTemplates()
+ s.Tmpl.PrintErrors()
s.timerStep("initialize & template prep")
if err = s.CreatePages(); err != nil {
return
diff --git a/tpl/template.go b/tpl/template.go
index <HASH>..<HASH> 100644
--- a/tpl/template.go
+++ b/tpl/template.go
@@ -50,6 +50,7 @@ type Template interface {
AddTemplate(name, tpl string) error
AddInternalTemplate(prefix, name, tpl string) error
AddInternalShortcode(name, tpl string) error
+ PrintErrors()
}
type templateErr struct {
@@ -1253,6 +1254,12 @@ func (t *GoHtmlTemplate) LoadTemplates(absPath string) {
t.loadTemplates(absPath, "")
}
+func (t *GoHtmlTemplate) PrintErrors() {
+ for _, e := range t.errors {
+ jww.ERROR.Println(e.err)
+ }
+}
+
func init() {
funcMap = template.FuncMap{
"urlize": helpers.Urlize, | Print template parsing errors to aid troubleshooting
Added a new Template.PrintErrors() function call,
used in hugolib/site.go#Process() so it does not clutter
up `go test -v ./...` results.
Special |
diff --git a/bin/putasset.js b/bin/putasset.js
index <HASH>..<HASH> 100755
--- a/bin/putasset.js
+++ b/bin/putasset.js
@@ -68,7 +68,7 @@ function main() {
if (!error)
putasset(token, {
repo,
- owner,
+ owner: user,
tag,
filename,
}, log); | fix(putasset) owner -> owner: user |
diff --git a/lib/writeexcel/workbook.rb b/lib/writeexcel/workbook.rb
index <HASH>..<HASH> 100644
--- a/lib/writeexcel/workbook.rb
+++ b/lib/writeexcel/workbook.rb
@@ -11,7 +11,6 @@
# original written in Perl by John McNamara
# converted to Ruby by Hideo Nakamura, cxn03651@msj.biglobe.ne.jp
#
-require 'digest/md5'
require 'nkf'
require 'writeexcel/biffwriter'
require 'writeexcel/worksheet' | * delete unneccessary require file. |
diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
index <HASH>..<HASH> 100644
--- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java
+++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java
@@ -172,7 +172,7 @@ class RangeSliceCommandSerializer implements IVersionedSerializer<RangeSliceComm
ByteBufferUtil.write(sc, out);
}
- IDiskAtomFilter.Serializer.instance.serialize(sliceCommand.predicate, out, version);
+ IDiskAtomFilter.Serializer.instance.serialize(filter, out, version);
if (sliceCommand.row_filter == null)
{ | Fix RangeSliceCommand serialization for SCs for <I> nodes |
diff --git a/runtime_test.go b/runtime_test.go
index <HASH>..<HASH> 100644
--- a/runtime_test.go
+++ b/runtime_test.go
@@ -321,7 +321,7 @@ func TestGet(t *testing.T) {
}
-func findAvailalblePort(runtime *Runtime, port int) (*Container, error) {
+func findAvailablePort(runtime *Runtime, port int) (*Container, error) {
strPort := strconv.Itoa(port)
container, err := NewBuilder(runtime).Create(&Config{
Image: GetTestImage(runtime).ID,
@@ -355,7 +355,7 @@ func TestAllocatePortLocalhost(t *testing.T) {
port += 1
log.Println("Trying port", port)
t.Log("Trying port", port)
- container, err = findAvailalblePort(runtime, port)
+ container, err = findAvailablePort(runtime, port)
if container != nil {
break
} | Fix a typo in runtime_test.go: Availalble -> Available |
diff --git a/lib/atomo/patterns/head_tail.rb b/lib/atomo/patterns/head_tail.rb
index <HASH>..<HASH> 100644
--- a/lib/atomo/patterns/head_tail.rb
+++ b/lib/atomo/patterns/head_tail.rb
@@ -22,7 +22,6 @@ module Atomo::Patterns
matched = g.new_label
g.dup
- g.dup
g.send :empty?, 0
g.git mismatch | correct HeadTail#matches? |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.