diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/python/pants/jvm/resolve/coursier_test_util.py b/src/python/pants/jvm/resolve/coursier_test_util.py
index <HASH>..<HASH> 100644
--- a/src/python/pants/jvm/resolve/coursier_test_util.py
+++ b/src/python/pants/jvm/resolve/coursier_test_util.py
@@ -25,7 +25,7 @@ class TestCoursierWrapper:
return (
JVMLockfileMetadata.new(requirements)
.add_header_to_lockfile(
- self.lockfile.to_serialized(), regenerate_command=f"{bin_name()} generate_lockfiles"
+ self.lockfile.to_serialized(), regenerate_command=f"{bin_name()} generate-lockfiles"
)
.decode()
)
|
[internal] fix a typo in test lockfiles (#<I>)
Fix a typo in test lockfiles. Ultimately doesn't affect anything of consequence but it is a nit.
[ci skip-build-wheels]
|
diff --git a/ActiveField.php b/ActiveField.php
index <HASH>..<HASH> 100644
--- a/ActiveField.php
+++ b/ActiveField.php
@@ -51,7 +51,7 @@ use yii\helpers\ArrayHelper;
* ```php
* use yii\bootstrap\ActiveForm;
*
- * $form = ActiveForm::begin(['layout' => 'horizontal'])
+ * $form = ActiveForm::begin(['layout' => 'horizontal']);
*
* // Form field without label
* echo $form->field($model, 'demo', [
|
Fixed typo in ActiveField PHPDoc
|
diff --git a/core/src/main/java/hudson/util/PersistedList.java b/core/src/main/java/hudson/util/PersistedList.java
index <HASH>..<HASH> 100644
--- a/core/src/main/java/hudson/util/PersistedList.java
+++ b/core/src/main/java/hudson/util/PersistedList.java
@@ -174,13 +174,13 @@ public class PersistedList<T> extends AbstractList<T> {
}
/**
- * Version of {@link #_onModified()} that swallows an exception for compliance with {@link List}.
+ * Version of {@link #onModified()} that throws an unchecked exception for compliance with {@link List}.
*/
private void _onModified() {
try {
onModified();
} catch (IOException e) {
- throw new Error(e);
+ throw new RuntimeException(e);
}
}
|
Do not throw Error for a recoverable condition.
In this case, someone tried to add an element to a persisted list, and it was added in memory but the configuration could not be saved.
Unclear whether that should even be treated as an error condition (the write failure might be transient, and a subsequent write would store the addition),
but if it should be then we should throw a simple runtime exception.
|
diff --git a/configuration.php b/configuration.php
index <HASH>..<HASH> 100644
--- a/configuration.php
+++ b/configuration.php
@@ -56,12 +56,12 @@ return array(
// The web server type, based on this type Fusio generates the fitting
// configuration format
- 'fusio_server_type' => \Fusio\Impl\Service\System\WebServer::APACHE2,
+ 'fusio_server_type' => null,
// Location of the automatically generated web server config file. Note
// Fusio writes only to this file if it exists. Also you may need to restart
// the web server so that the config changes take affect
- 'fusio_server_conf' => '/etc/apache2/sites-available/000-fusio.conf',
+ 'fusio_server_conf' => null,
// The url to the psx public folder (i.e. http://127.0.0.1/psx/public or
// http://localhost.com)
|
fix write no server config in tests
|
diff --git a/breacharbiter.go b/breacharbiter.go
index <HASH>..<HASH> 100644
--- a/breacharbiter.go
+++ b/breacharbiter.go
@@ -512,7 +512,7 @@ func (b *breachArbiter) breachObserver(contract *lnwallet.LightningChannel,
desc.SigHashes = hc
desc.InputIndex = inputIndex
- return lnwallet.CommitSpendNoDelay(b.wallet.Signer, desc, tx)
+ return lnwallet.CommitSpendNoDelay(b.wallet.Cfg.Signer, &desc, tx)
}
// Next we create the witness generation function that will be
@@ -527,7 +527,7 @@ func (b *breachArbiter) breachObserver(contract *lnwallet.LightningChannel,
desc.SigHashes = hc
desc.InputIndex = inputIndex
- return lnwallet.CommitSpendRevoke(b.wallet.Signer, desc, tx)
+ return lnwallet.CommitSpendRevoke(b.wallet.Cfg.Signer, &desc, tx)
}
// Finally, with the two witness generation funcs created, we
|
breacharbiter: update wallet/signer API usage to due recent changes
|
diff --git a/src/core/Skeleton.js b/src/core/Skeleton.js
index <HASH>..<HASH> 100644
--- a/src/core/Skeleton.js
+++ b/src/core/Skeleton.js
@@ -127,7 +127,7 @@ const Skeleton = Class.create(/** @lends Skeleton.prototype */ {
*/
copy(skeleton, rootNode) {
this.inverseBindMatrices = skeleton.inverseBindMatrices;
- this.jointNames = skeleton.jointNames;
+ this.jointNames = skeleton.jointNames.slice();
if (rootNode === undefined) {
rootNode = skeleton.rootNode;
}
|
fix: skeleton.clone should also clone jointNames
|
diff --git a/lib/pundit/resource.rb b/lib/pundit/resource.rb
index <HASH>..<HASH> 100644
--- a/lib/pundit/resource.rb
+++ b/lib/pundit/resource.rb
@@ -54,7 +54,7 @@ module Pundit
records = _model.public_send(association_name)
policy_scope = Pundit.policy_scope!(
context[:current_user],
- association_reflection.class_name.constantize
+ records
)
records.merge(policy_scope)
elsif [:has_one, :belongs_to].include?(association_reflection.macro)
|
fix for has_many relationships #1
|
diff --git a/src/GitHub_Updater/Plugin.php b/src/GitHub_Updater/Plugin.php
index <HASH>..<HASH> 100644
--- a/src/GitHub_Updater/Plugin.php
+++ b/src/GitHub_Updater/Plugin.php
@@ -409,8 +409,6 @@ class Plugin {
if ( ! \is_object( $transient ) ) {
$transient = new \stdClass();
$transient->response = null;
- } elseif ( ! \property_exists( $transient, 'response' ) ) {
- $transient->response = null;
}
foreach ( (array) $this->config as $plugin ) {
diff --git a/src/GitHub_Updater/Theme.php b/src/GitHub_Updater/Theme.php
index <HASH>..<HASH> 100644
--- a/src/GitHub_Updater/Theme.php
+++ b/src/GitHub_Updater/Theme.php
@@ -672,8 +672,6 @@ class Theme {
if ( ! \is_object( $transient ) ) {
$transient = new \stdClass();
$transient->response = null;
- } elseif ( ! \property_exists( $transient, 'response' ) ) {
- $transient->response = null;
}
foreach ( (array) $this->config as $theme ) {
|
only need to declare stdClass
|
diff --git a/client/fingerprint/network_unix.go b/client/fingerprint/network_unix.go
index <HASH>..<HASH> 100644
--- a/client/fingerprint/network_unix.go
+++ b/client/fingerprint/network_unix.go
@@ -105,7 +105,6 @@ func (f *UnixNetworkFingerprint) linkSpeedSys(device string) int {
return 0
}
- // Convert to MB/s
if mbs > 0 {
return mbs
}
@@ -140,9 +139,8 @@ func (f *UnixNetworkFingerprint) linkSpeedEthtool(path, device string) int {
return 0
}
- // Convert to MB/s
if mbs > 0 {
- return mbs / 8
+ return mbs
}
}
f.logger.Printf("error calling ethtool (%s): %s", path, err)
|
don't re-convert mbits
|
diff --git a/js/jquery.fileupload.js b/js/jquery.fileupload.js
index <HASH>..<HASH> 100644
--- a/js/jquery.fileupload.js
+++ b/js/jquery.fileupload.js
@@ -215,7 +215,7 @@
],
_BitrateTimer: function () {
- this.timestamp = (new Date()).getTime();
+ this.timestamp = ((Date.now) ? Date.now() : (new Date()).getTime());
this.loaded = 0;
this.bitrate = 0;
this.getBitrate = function (now, loaded, interval) {
@@ -289,7 +289,7 @@
_onProgress: function (e, data) {
if (e.lengthComputable) {
- var now = (new Date()).getTime(),
+ var now = ((Date.now) ? Date.now() : (new Date()).getTime()),
loaded;
if (data._time && data.progressInterval &&
(now - data._time < data.progressInterval) &&
|
Optimized timestamp retrieval to take advantage of faster Date.now() available in all modern browsers, with backwards compatable option for IE < 9
|
diff --git a/presto-main/src/main/resources/webapp/assets/utils.js b/presto-main/src/main/resources/webapp/assets/utils.js
index <HASH>..<HASH> 100644
--- a/presto-main/src/main/resources/webapp/assets/utils.js
+++ b/presto-main/src/main/resources/webapp/assets/utils.js
@@ -378,23 +378,23 @@ function formatDataSizeMinUnit(size, minUnit) {
}
if (size >= 1024) {
size /= 1024;
- unit = "K";
+ unit = "K" + minUnit;
}
if (size >= 1024) {
size /= 1024;
- unit = "M";
+ unit = "M" + minUnit;
}
if (size >= 1024) {
size /= 1024;
- unit = "G";
+ unit = "G" + minUnit;
}
if (size >= 1024) {
size /= 1024;
- unit = "T";
+ unit = "T" + minUnit;
}
if (size >= 1024) {
size /= 1024;
- unit = "P";
+ unit = "P" + minUnit;
}
return precisionRound(size) + unit;
}
|
Fix formatDataSize to include min unit
|
diff --git a/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java b/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
index <HASH>..<HASH> 100644
--- a/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
+++ b/src/tuwien/auto/calimero/knxnetip/util/TunnelCRI.java
@@ -112,20 +112,21 @@ public class TunnelCRI extends CRI
*
* @return layer value as unsigned byte
*/
+ // TODO maybe deprecate in favor of the enum version
public final int getKNXLayer()
{
return opt[0] & 0xFF;
}
-// /**
-// * Returns the requested tunneling layer.
-// *
-// * @return tunneling layer
-// */
-// public final TunnelingLayer getLayer()
-// {
-// return TunnelingLayer.from(getKNXLayer());
-// }
+ /**
+ * Returns the requested tunneling layer.
+ *
+ * @return tunneling layer
+ */
+ public final TunnelingLayer tunnelingLayer()
+ {
+ return TunnelingLayer.from(getKNXLayer());
+ }
public final Optional<IndividualAddress> tunnelingAddress() {
if (getStructLength() == 6)
|
Uncomment enum version of tunneling layer, which is preferred over int
|
diff --git a/src/Coders/Model/Factory.php b/src/Coders/Model/Factory.php
index <HASH>..<HASH> 100644
--- a/src/Coders/Model/Factory.php
+++ b/src/Coders/Model/Factory.php
@@ -24,7 +24,7 @@ class Factory
/**
* @var \Reliese\Meta\SchemaManager
*/
- protected $schemas;
+ protected $schemas = [];
/**
* @var \Illuminate\Filesystem\Filesystem
diff --git a/src/Meta/Blueprint.php b/src/Meta/Blueprint.php
index <HASH>..<HASH> 100644
--- a/src/Meta/Blueprint.php
+++ b/src/Meta/Blueprint.php
@@ -208,7 +208,7 @@ class Blueprint
return current($this->unique);
}
- $nullPrimaryKey = new Fluent();
+ $nullPrimaryKey = new Fluent(['columns' => []]);
return $nullPrimaryKey;
}
|
Fix #<I> Command fails if a table doesn't have AI PK column.
Blueprint sets up a new Fluent without ensuring it has an array of `columns`,
which is a required attribute. This modifies a call to a `Fluent` constructor
providing a null array `columns.`
Factory declares `$schema` property which never instantiated, and is required to
be an array. This modifies the declaration to provide instantiation of a null array.
|
diff --git a/src/nu/validator/servlet/VerifierServletTransaction.java b/src/nu/validator/servlet/VerifierServletTransaction.java
index <HASH>..<HASH> 100644
--- a/src/nu/validator/servlet/VerifierServletTransaction.java
+++ b/src/nu/validator/servlet/VerifierServletTransaction.java
@@ -687,6 +687,12 @@ class VerifierServletTransaction implements DocumentModeHandler, SchemaResolver
document = ("".equals(document)) ? null : document;
+ if (document.contains("www.metaescort.com")) {
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST,
+ "No input document");
+ return;
+ }
+
String callback = null;
if (outputFormat == OutputFormat.JSON) {
callback = request.getParameter("callback");
|
Start doing some rudimentary blacklisting
The W3C checker service gets massive numbers of requests for URLs at
certain domains. This is an experiment with blacklisting such domains.
Later we can parameterize this and add a new runtime option for it.
|
diff --git a/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java b/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
index <HASH>..<HASH> 100644
--- a/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
+++ b/src/test/java/com/thinkaurelius/titan/graphdb/TitanGraphTest.java
@@ -241,6 +241,32 @@ public abstract class TitanGraphTest extends TitanGraphTestCommon {
}
@Test
+ public void testPropertyIndexPersistence() {
+ final String propName = "favorite_color";
+ final String sharedValue = "blue";
+
+ makeStringPropertyKey(propName);
+
+ TitanVertex alice = tx.addVertex();
+ TitanVertex bob = tx.addVertex();
+
+ alice.addProperty(propName, sharedValue);
+
+ clopen();
+
+ alice = tx.getVertex(alice.getID());
+ bob = tx.getVertex(bob.getID());
+
+ assertEquals(sharedValue, alice.getProperty(propName));
+ assertEquals(null, bob.getProperty(propName));
+
+ alice.removeProperty(propName);
+ bob.addProperty(propName, sharedValue);
+
+ clopen();
+ }
+
+ @Test
public void testIndexRetrieval() {
TitanKey id = makeIntegerUIDPropertyKey("uid");
TitanKey name = makeStringPropertyKey("name");
|
Add test case to catch future regressions on #<I>
Consider an indexed but non-unique property p and some associated
value v of p. When p=v is both removed from some vertex and added to
a different vertex in the same transaction, a NullPointerException
would be guaranteed in commits prior to
<I>a0a<I>f<I>d6ef6c<I>f<I>ab9. This unit test method added
by this commit exists to watch for regression..
|
diff --git a/udata/sitemap.py b/udata/sitemap.py
index <HASH>..<HASH> 100644
--- a/udata/sitemap.py
+++ b/udata/sitemap.py
@@ -24,5 +24,5 @@ def load_page(fn):
def init_app(app):
app.config['SITEMAP_VIEW_DECORATORS'] = [load_page]
- app.config['SITEMAP_URL_METHOD'] = 'https'
+ app.config['SITEMAP_URL_METHOD'] = 'https' if app.config['USE_SSL'] else 'http'
sitemap.init_app(app)
|
Only use https URLs when USE_SSL is True
|
diff --git a/pymyq/api.py b/pymyq/api.py
index <HASH>..<HASH> 100644
--- a/pymyq/api.py
+++ b/pymyq/api.py
@@ -17,7 +17,7 @@ BASE_API_VERSION = 5
API_BASE = "https://api.myqdevice.com/api/v{0}"
DEFAULT_APP_ID = "JVM/G9Nwih5BwKgNCjLxiFUQxQijAebyyg8QUHr7JOrP+tuPb8iHfRHKwTmDzHOu"
-DEFAULT_USER_AGENT = "myQ/19569 CFNetwork/1107.1 Darwin/19.0.0"
+DEFAULT_USER_AGENT = "okhttp/3.10.0"
DEFAULT_BRAND_ID = 2
DEFAULT_REQUEST_RETRIES = 5
DEFAULT_CULTURE = "en"
|
Update USER_AGENT (again) (fixes #<I>) (#<I>)
The server is again unhappy about USER_AGENT. Examining a session from the
"real" Android app shows "okhttp/<I>", which seems to make the server
happy (for now?)
|
diff --git a/frontend/src/store/feature-tags/index.js b/frontend/src/store/feature-tags/index.js
index <HASH>..<HASH> 100644
--- a/frontend/src/store/feature-tags/index.js
+++ b/frontend/src/store/feature-tags/index.js
@@ -16,7 +16,7 @@ const featureTags = (state = getInitState(), action) => {
case TAG_FEATURE_TOGGLE:
return state.push(new $MAP(action.tag));
case UNTAG_FEATURE_TOGGLE:
- return state.remove(state.indexOf(t => t.id === action.value.tagId));
+ return state.remove(state.indexOf(t => t.value === action.tag.value && t.type === action.tag.type));
default:
return state;
}
|
fix: Use type and value from action to remove tag (#<I>)
fixes: #<I>
|
diff --git a/polyaxon_cli/managers/deploy.py b/polyaxon_cli/managers/deploy.py
index <HASH>..<HASH> 100644
--- a/polyaxon_cli/managers/deploy.py
+++ b/polyaxon_cli/managers/deploy.py
@@ -34,7 +34,9 @@ class DeployManager(object):
@property
def is_kubernetes(self):
- return self.deployment_type == DeploymentTypes.KUBERNETES
+ return self.deployment_type in {DeploymentTypes.KUBERNETES,
+ DeploymentTypes.MINIKUBE,
+ DeploymentTypes.MICRO_K8S}
@property
def is_docker_compose(self):
|
Add minikube and microk8s deployment
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100755
--- a/setup.py
+++ b/setup.py
@@ -80,6 +80,8 @@ setup(
'doc/man/salt-key.1',
'doc/man/salt.1',
'doc/man/salt-cp.1',
+ 'doc/man/salt-call.1',
+ 'doc/man/salt-syndic.1',
'doc/man/salt-run.1',
'doc/man/salt-minion.1',
]),
|
Add salt-syndic manpage to setup.py
|
diff --git a/src/org/openscience/cdk/layout/AtomPlacer.java b/src/org/openscience/cdk/layout/AtomPlacer.java
index <HASH>..<HASH> 100644
--- a/src/org/openscience/cdk/layout/AtomPlacer.java
+++ b/src/org/openscience/cdk/layout/AtomPlacer.java
@@ -1054,7 +1054,7 @@ public class AtomPlacer
IBond bond = (IBond)bonds.get(g);
if (bond.getOrder() == 3) sum += 10;
else if (bond.getOrder() == 1) sum += 1;
- else if (bond.getOrder() == 2) sum += 5;
+// else if (bond.getOrder() == 2) sum += 5;
}
if (sum >= 10) return true;
return false;
|
Commented out a line which affects SO2 group layout. The new version looks better.
git-svn-id: <URL>
|
diff --git a/test/tests-live-query.js b/test/tests-live-query.js
index <HASH>..<HASH> 100644
--- a/test/tests-live-query.js
+++ b/test/tests-live-query.js
@@ -153,6 +153,12 @@ promisedTest("subscribe to range", async ()=> {
});
promisedTest("subscribe to keys", async ()=>{
+ if (isIE) {
+ // The IE implementation becomes shaky here.
+ // Maybe becuase we launch several parallel queries to IDB.
+ ok(true, "Skipping this test for IE - too shaky for the CI");
+ return;
+ }
let signal1 = new Signal(), signal2 = new Signal();
let count1 = 0, count2 = 0;
//const debugTxCommitted = set => console.debug("txcommitted", set);
|
IE<I> is too shaky for "subscribe to keys" test.
|
diff --git a/lib/rudy/routines/handlers/group.rb b/lib/rudy/routines/handlers/group.rb
index <HASH>..<HASH> 100644
--- a/lib/rudy/routines/handlers/group.rb
+++ b/lib/rudy/routines/handlers/group.rb
@@ -22,12 +22,12 @@ module Rudy; module Routines; module Handlers;
name ||= current_group_name
addresses ||= [Rudy::Utils::external_ip_address]
if ports.nil?
- ports = current_machine_os.to_s == 'win32' ? [22,3389] : [22]
+ ports = current_machine_os.to_s == 'win32' ? [3389,22] : [22]
end
ports.each do |port|
#li "Authorizing port #{port} access for: #{addresses.join(', ')}"
- Rudy::AWS::EC2::Groups.authorize(name, addresses, [[port, port]])
+ Rudy::AWS::EC2::Groups.authorize(name, addresses, [[port, port]]) rescue nil
end
end
|
Fix security group authorization for new windows instances
|
diff --git a/lib/ttf/tables/maxp.js b/lib/ttf/tables/maxp.js
index <HASH>..<HASH> 100644
--- a/lib/ttf/tables/maxp.js
+++ b/lib/ttf/tables/maxp.js
@@ -5,17 +5,20 @@
var _ = require('lodash');
var jDataView = require('jDataView');
-//find max points in glyph contours
+// Find max points in glyph contours.
+// Actual number of points can be reduced in the further code, but it is not a problem.
+// This number cannot be less than max glyph points because of glyph missing
+// in certain cases in some browser (like Chrome in MS Windows).
function getMaxPoints(font) {
- var result = 0;
- _.forEach(font.glyphs, function (glyph) {
- _.forEach(glyph.contours, function (contour) {
- if (contour.points.length > result) {
- result = contour.points.length;
- }
- });
- });
- return result;
+ var maxPoints = 0;
+ return _.reduce(font.glyphs, function (maxPoints, glyph) {
+
+ var sumPoints = _.reduce(glyph.contours, function (sumPoints, contour) {
+ return (sumPoints || 0) + contour.points.length;
+ }, sumPoints);
+
+ return Math.max(sumPoints || 0, maxPoints);
+ }, maxPoints);
}
function getMaxContours(font) {
|
Fixed bug in MAXP table: some of glyphs was missed in Chrome for WIndows in certain cases.
|
diff --git a/packages/react-server/core/context/Navigator.js b/packages/react-server/core/context/Navigator.js
index <HASH>..<HASH> 100644
--- a/packages/react-server/core/context/Navigator.js
+++ b/packages/react-server/core/context/Navigator.js
@@ -272,11 +272,11 @@ class Navigator extends EventEmitter {
// We don't want to leave navigation detritus
// laying around as we discard bypassed pages.
- if (this._nextRoute) this._nextRoute[3].reject();
+ if (this._nextRoute) this._nextRoute.dfd.reject();
dfd = Q.defer(), promise = dfd.promise;
- this._nextRoute = [route, request, type, dfd];
+ this._nextRoute = {route, request, type, dfd};
}
// If we're _currently_ navigating, we'll wait to start the
@@ -284,7 +284,7 @@ class Navigator extends EventEmitter {
// navigation causes all kinds of havoc.
if (!this._loading && this._nextRoute){
- [route, request, type, dfd] = this._nextRoute;
+ const {route, request, type, dfd} = this._nextRoute;
this._loading = true;
this._currentRoute = route;
|
Future-proof frame skipping a bit
Names are better than numbers.
|
diff --git a/build_config.php b/build_config.php
index <HASH>..<HASH> 100644
--- a/build_config.php
+++ b/build_config.php
@@ -2,7 +2,7 @@
$buildConfig = array (
'major' => 2,
'minor' => 9,
- 'build' => 27,
+ 'build' => 28,
'shopgate_library_path' => "",
'plugin_name' => "library",
'display_name' => "Shopgate Library 2.9.x",
diff --git a/classes/core.php b/classes/core.php
index <HASH>..<HASH> 100644
--- a/classes/core.php
+++ b/classes/core.php
@@ -24,7 +24,7 @@
###################################################################################
# define constants
###################################################################################
-define('SHOPGATE_LIBRARY_VERSION', '2.9.27');
+define('SHOPGATE_LIBRARY_VERSION', '2.9.28');
define('SHOPGATE_LIBRARY_ENCODING' , 'UTF-8');
define('SHOPGATE_BASE_DIR', realpath(dirname(__FILE__).'/../'));
|
Increased Shopgate Library <I>.x to version <I>.
|
diff --git a/lib/Doctrine/DBAL/Migrations/Version.php b/lib/Doctrine/DBAL/Migrations/Version.php
index <HASH>..<HASH> 100644
--- a/lib/Doctrine/DBAL/Migrations/Version.php
+++ b/lib/Doctrine/DBAL/Migrations/Version.php
@@ -239,15 +239,16 @@ class Version
$this->_outputWriter->write(' <comment>-></comment> ' . $query);
$this->_connection->executeQuery($query);
}
-
- if ($direction === 'up') {
- $this->markMigrated();
- } else {
- $this->markNotMigrated();
- }
} else {
$this->_outputWriter->write(sprintf('<error>Migration %s was executed but did not result in any SQL statements.</error>', $this->_version));
}
+
+ if ($direction === 'up') {
+ $this->markMigrated();
+ } else {
+ $this->markNotMigrated();
+ }
+
} else {
foreach ($this->_sql as $query) {
$this->_outputWriter->write(' <comment>-></comment> ' . $query);
|
Always add/remove the entry from the doctrine_migration_versions
table regardless of its content.
This fixes a bug where entries were not removed if either the
up or down methods didn't contain an action. In some instance
this meant you could migrate down, but no longer migrate up
at a later date.
|
diff --git a/pyeapi/client.py b/pyeapi/client.py
index <HASH>..<HASH> 100644
--- a/pyeapi/client.py
+++ b/pyeapi/client.py
@@ -405,16 +405,10 @@ def connect(transport=None, host='localhost', username='admin',
"""
transport = transport or DEFAULT_TRANSPORT
connection = make_connection(transport, host=host, username=username,
- password=password, port=port, timeout=timeout)
+ password=password, port=port, timeout=timeout)
if return_node:
- kwargs = dict(
- transport=transport,
- host=host,
- username=username,
- password=password,
- port=port,
- )
- return Node(connection, **kwargs)
+ return Node(connection, transport=transport, host=host,
+ username=username, password=password, port=port)
return connection
|
pass args directly to Node() method
|
diff --git a/spec/services/referrals/capture_referral_action_service.rb b/spec/services/referrals/capture_referral_action_service.rb
index <HASH>..<HASH> 100644
--- a/spec/services/referrals/capture_referral_action_service.rb
+++ b/spec/services/referrals/capture_referral_action_service.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe Referrals::CaptureReferralActionService do
+
+end
\ No newline at end of file
|
Capture Referral action service spec
|
diff --git a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java
index <HASH>..<HASH> 100644
--- a/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java
+++ b/cellbase-app/src/main/java/org/opencb/cellbase/app/cli/CliOptionsParser.java
@@ -378,8 +378,11 @@ public class CliOptionsParser {
required = false, arity = 0)
public boolean benchmark;
- @Parameter(names = {"--reference-fasta"}, description = "To use only with the --benchmark flag. Full path to a "
- + " fasta file containing the reference genome.",
+ @Parameter(names = {"--reference-fasta"}, description = "Enables left-alignment normalisation: set this parameter"
+ + " to the full path to a fasta (not fasta.gz!) file containing the reference sequence if you want to enable"
+ + " lef-alignment during the normalisation process. If not set (default), left-alignment step will be skipped"
+ + " during normalisation. **NOTE**: this parameter is mandatory if the --benchmark flag is enabled (in "
+ + " this case fasta.gz files are allowed)",
required = false, arity = 1)
public String referenceFasta;
|
feature-va-left-align: implementation of left align normalisation in VA CLI started
|
diff --git a/brigade/plugins/tasks/networking/netmiko_run.py b/brigade/plugins/tasks/networking/netmiko_run.py
index <HASH>..<HASH> 100644
--- a/brigade/plugins/tasks/networking/netmiko_run.py
+++ b/brigade/plugins/tasks/networking/netmiko_run.py
@@ -32,9 +32,10 @@ def netmiko_run(task, method, ip=None, host=None, username=None, password=None,
* result (``dict``): dictionary with the result of the getter
"""
parameters = {
- "ip": ip or host or task.ip,
+ "ip": ip or host or task.host.host,
"username": username or task.host.username,
"password": password or task.host.password,
+ "port": task.host.network_api_port,
}
parameters.update(netmiko_dict or {})
device_type = device_type or task.host.nos
|
added port and correct way of getting the ip of the host
|
diff --git a/lib/App.php b/lib/App.php
index <HASH>..<HASH> 100644
--- a/lib/App.php
+++ b/lib/App.php
@@ -74,11 +74,12 @@ class App extends Base
protected $controllerInstances = array();
/**
- * An array contains the pre-defined controller classes
+ * An array that stores predefined controller class,
+ * the key is controller name and value is controller class name
*
* @var array
*/
- protected $controllerClasses = array();
+ protected $controllerMap = array();
/**
* Startup an MVC application
@@ -179,7 +180,7 @@ class App extends Base
protected function handleNotFound(array $notFound)
{
- $notFound += array('classes' => array(), 'actions' => array())
+ $notFound += array('classes' => array(), 'actions' => array());
// All controllers and actions were not found, prepare exception message
$message = 'The page you requested was not found';
@@ -346,8 +347,8 @@ class App extends Base
$classes[] = $class;
// Add class from pre-defined classes
- if (isset($this->controllerClasses[$controller])) {
- $classes[] = $this->controllerClasses[$controller];
+ if (isset($this->controllerMap[$controller])) {
+ $classes[] = $this->controllerMap[$controller];
}
return $classes;
|
renamed controllerClasses to controllerMap
|
diff --git a/conversejs/utils.py b/conversejs/utils.py
index <HASH>..<HASH> 100644
--- a/conversejs/utils.py
+++ b/conversejs/utils.py
@@ -41,6 +41,8 @@ def get_conversejs_context(context, xmpp_login=False):
bosh = BOSHClient(xmpp_account.jid, xmpp_account.password,
context['CONVERSEJS_BOSH_SERVICE_URL'])
jid, sid, rid = bosh.get_credentials()
+ bosh.close_connection()
+
context.update({'jid': jid, 'sid': sid, 'rid': rid})
return context
|
Closing bosh connection after getting credentials
|
diff --git a/lib/unfluff.js b/lib/unfluff.js
index <HASH>..<HASH> 100644
--- a/lib/unfluff.js
+++ b/lib/unfluff.js
@@ -59,7 +59,7 @@ void function () {
publisher: function () {
var doc;
doc = getParsedDoc.call(this, html);
- return null != this.publisher ? this.publisher : this.publisher = extractor.publisher(doc);
+ return null != this.publisher_ ? this.publisher_ : this.publisher_ = extractor.publisher(doc);
},
favicon: function () {
var doc;
|
Forgot to add compiled unfluff.js!
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -14,7 +14,7 @@ function resizeListener(e) {
})
}
-var exports = function exports(element, fn) {
+var _exports = function exports(element, fn) {
var window = this
var document = window.document
var isIE
@@ -67,7 +67,7 @@ var exports = function exports(element, fn) {
element.__resizeListeners__.push(fn)
}
-module.exports = typeof window === 'undefined' ? exports : exports.bind(window)
+module.exports = typeof window === 'undefined' ? _exports : _exports.bind(window)
module.exports.unbind = function (element, fn) {
var attachEvent = document.attachEvent
|
Rename exports to _exports
|
diff --git a/lib/hci-socket/hci.js b/lib/hci-socket/hci.js
index <HASH>..<HASH> 100644
--- a/lib/hci-socket/hci.js
+++ b/lib/hci-socket/hci.js
@@ -70,8 +70,11 @@ var STATUS_MAPPER = require('./hci-status');
var Hci = function() {
this._socket = new BluetoothHciSocket();
this._isDevUp = null;
+ this._state = null;
this._handleBuffers = {};
+
+ this.on('stateChange', this.onStateChange.bind(this));
};
util.inherits(Hci, events.EventEmitter);
@@ -479,7 +482,7 @@ Hci.prototype.processCmdCompleteEvent = function(cmd, status, result) {
if (hciVer < 0x06) {
this.emit('stateChange', 'unsupported');
- } else {
+ } else if (this._state !== 'poweredOn') {
this.setAdvertiseEnable(false);
this.setAdvertisingParameters();
}
@@ -562,4 +565,8 @@ Hci.prototype.processLeConnUpdateComplete = function(status, data) {
this.emit('leConnUpdateComplete', status, handle, interval, latency, supervisionTimeout);
};
+Hci.prototype.onStateChange = function(state) {
+ this._state = state;
+};
+
module.exports = Hci;
|
- don't reset advertising state on read local version response if state is powered on
|
diff --git a/MAPKIT/mapkit/RasterConverter.py b/MAPKIT/mapkit/RasterConverter.py
index <HASH>..<HASH> 100644
--- a/MAPKIT/mapkit/RasterConverter.py
+++ b/MAPKIT/mapkit/RasterConverter.py
@@ -294,7 +294,12 @@ class RasterConverter(object):
# Zip KML wrapper file and png together with extension kmz
-
+ def getAsKmlTimeSeries(self):
+ '''
+ Get a set of rasters as a kml time series
+ '''
+
+
def setColorRamp(self, colorRamp=None):
'''
Set the color ramp of the raster converter instance
|
Added definition for time series method.
|
diff --git a/lib/Server.js b/lib/Server.js
index <HASH>..<HASH> 100644
--- a/lib/Server.js
+++ b/lib/Server.js
@@ -256,11 +256,11 @@ function Server(compiler, options) {
var defaultFeatures = ["setup", "headers", "middleware"];
if(options.proxy)
defaultFeatures.push("proxy");
- if(options.historyApiFallback)
- defaultFeatures.push("historyApiFallback", "middleware");
defaultFeatures.push("magicHtml");
if(options.contentBase !== false)
defaultFeatures.push("contentBase");
+ if(options.historyApiFallback)
+ defaultFeatures.push("historyApiFallback", "middleware");
// compress is placed last and uses unshift so that it will be the first middleware used
if(options.compress)
defaultFeatures.unshift("compress");
|
Fix historyApiFallback for nested paths #<I> (#<I>)
|
diff --git a/salt/states/file.py b/salt/states/file.py
index <HASH>..<HASH> 100644
--- a/salt/states/file.py
+++ b/salt/states/file.py
@@ -26,6 +26,22 @@ which makes use of the jinja templating system would look like this:
custom_var: "default value"
other_var: 123
+The ``source`` parameter can be specified as a list. IF this is done, then the
+first file to be matched will be the one that is used. This allows you to have
+a default file on which to fall back if the desired file does not exist on the
+salt fileserver. Here's an example:
+
+.. code-block:: yaml
+ /etc/foo.conf
+ file.managed:
+ - source:
+ - salt://foo.conf.{{ grains['fqdn'] }}
+ - salt://foo.conf.fallback
+ - user: foo
+ - group: users
+ - mode: 644
+
+
Directories can be managed via the ``directory`` function. This function can
create and enforce the permissions on a directory. A directory statement will
look like this:
|
Add info on specifying a list of file sources
I was surprised to not find this described at all in the docs. It's an
awesome feature, I think.
|
diff --git a/src/JMS/Serializer/Twig/SerializerExtension.php b/src/JMS/Serializer/Twig/SerializerExtension.php
index <HASH>..<HASH> 100644
--- a/src/JMS/Serializer/Twig/SerializerExtension.php
+++ b/src/JMS/Serializer/Twig/SerializerExtension.php
@@ -43,28 +43,18 @@ class SerializerExtension extends \Twig_Extension
public function getFilters()
{
return array(
- 'serialize' => new \Twig_Filter_Method($this, 'serialize'),
+ new \Twig_SimpleFilter('serialize', array($this, 'serialize')),
);
}
public function getFunctions()
{
return array(
- 'serialization_context' => new \Twig_Function_Method($this, 'createContext'),
+ new \Twig_SimpleFunction('serialization_context', '\JMS\Serializer\SerializationContext::createContext'),
);
}
/**
- * Creates the serialization context
- *
- * @return SerializationContext
- */
- public function createContext()
- {
- return SerializationContext::create();
- }
-
- /**
* @param object $object
* @param string $type
* @param SerializationContext $context
|
Switch the Twig integration to use non-deprecated APIs
|
diff --git a/src/core/i18n/index.js b/src/core/i18n/index.js
index <HASH>..<HASH> 100644
--- a/src/core/i18n/index.js
+++ b/src/core/i18n/index.js
@@ -11,6 +11,11 @@ class Dict {
return r.replace(`{${k}}`, v);
}, this.dict.getIn(keyPath, ""));
}
+
+ // TODO: this is a bad name because it's meant to be used in groups
+ raw(keyPath) {
+ return this.dict.getIn(keyPath, Map()).toJS();
+ }
}
let dicts = Map();
diff --git a/src/core/i18n/t.js b/src/core/i18n/t.js
index <HASH>..<HASH> 100644
--- a/src/core/i18n/t.js
+++ b/src/core/i18n/t.js
@@ -1,6 +1,10 @@
import React from 'react';
export default function(dict, keyPath, params = {}) {
+ if (params.__raw) {
+ return dict.raw(keyPath);
+ }
+
const html = dict.get(keyPath, params);
if (!html) {
return null;
|
Allow to get a group of translations
|
diff --git a/airflow/contrib/hooks/gcp_dataflow_hook.py b/airflow/contrib/hooks/gcp_dataflow_hook.py
index <HASH>..<HASH> 100644
--- a/airflow/contrib/hooks/gcp_dataflow_hook.py
+++ b/airflow/contrib/hooks/gcp_dataflow_hook.py
@@ -65,6 +65,9 @@ class _DataflowJob(LoggingMixin):
if 'currentState' in self._job:
if 'JOB_STATE_DONE' == self._job['currentState']:
return True
+ elif 'JOB_STATE_RUNNING' == self._job['currentState'] and \
+ 'JOB_TYPE_STREAMING' == self._job['type']:
+ return True
elif 'JOB_STATE_FAILED' == self._job['currentState']:
raise Exception("Google Cloud Dataflow job {} has failed.".format(
self._job['name']))
|
[AIRFLOW-<I>] Update DataflowHook waitfordone for Streaming type job[]
AIRFLOW-<I> Update DataflowHook waitfordone for
Streaming type job
fix flake8
Closes #<I> from ivanwirawan/AIRFLOW-<I>
|
diff --git a/code/controllers/FrontEndWorkflowController.php b/code/controllers/FrontEndWorkflowController.php
index <HASH>..<HASH> 100644
--- a/code/controllers/FrontEndWorkflowController.php
+++ b/code/controllers/FrontEndWorkflowController.php
@@ -73,6 +73,7 @@ abstract class FrontEndWorkflowController extends Controller {
* @return Form
*/
public function Form(){
+
$svc = singleton('WorkflowService');
$active = $svc->getWorkflowFor($this->getContextObject());
@@ -90,10 +91,11 @@ abstract class FrontEndWorkflowController extends Controller {
// set any requirements spcific to this contextobject
$active->setFrontendFormRequirements();
- // @todo - are these required?
- $this->extend('updateFrontendActions', $wfActions);
- $this->extend('updateFrontendFields', $wfFields);
- $this->extend('updateFrontendValidator', $wfValidator);
+ // hooks for decorators
+ $this->extend('updateFrontEndWorkflowFields', $wfActions);
+ $this->extend('updateFrontEndWorkflowActions', $wfFields);
+ $this->extend('updateFrontEndRequiredFields', $wfValidator);
+ $this->extend('updateFrontendFormRequirements');
$form = new FrontendWorkflowForm($this, 'Form', $wfFields, $wfActions, $wfValidator);
|
tidied up form hooks
|
diff --git a/src/js/core/wrappedselection.js b/src/js/core/wrappedselection.js
index <HASH>..<HASH> 100644
--- a/src/js/core/wrappedselection.js
+++ b/src/js/core/wrappedselection.js
@@ -611,7 +611,8 @@ rangy.createModule("WrappedSelection", function(api, module) {
selProto.refresh = function(checkForChanges) {
var oldRanges = checkForChanges ? this._ranges.slice(0) : null;
- var wasBackward = this.isBackward();
+ var oldAnchorNode = this.anchorNode, oldAnchorOffset = this.anchorOffset;
+
refreshSelection(this);
if (checkForChanges) {
// Check the range count first
@@ -621,9 +622,10 @@ rangy.createModule("WrappedSelection", function(api, module) {
return true;
}
- // Now check the direction
- if (this.isBackward() != wasBackward) {
- log.debug("Selection.refresh: Selection backward was " + wasBackward + ", is now " + this.isBackward());
+ // Now check the direction. Checking the anchor position is the same is enough since we're checking all the
+ // ranges after this
+ if (this.anchorNode != oldAnchorNode || this.anchorOffset != oldAnchorOffset) {
+ log.debug("Selection.refresh: anchor different, so selection has changed");
return true;
}
|
Fix for exception thrown by selection.refresh(). See issue <I>.
|
diff --git a/src/sassdoc.js b/src/sassdoc.js
index <HASH>..<HASH> 100644
--- a/src/sassdoc.js
+++ b/src/sassdoc.js
@@ -70,7 +70,5 @@ export function refresh(dest, config) {
export var documentize = sassdoc;
// Re-export, expose API.
-export { default as Logger } from './logger';
-export { default as config } from './cfg';
-export { default as Converter } from './converter';
-export { default as Parser } from './parser';
+export { Logger, Converter, Parser };
+export { default as cfg } from './cfg';
|
Refactor API re-export
- No way to export all of cfg, might be enough for plugins
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
maintainer='Lars Butler',
maintainer_email='lars.butler@gmail.com',
url='https://github.com/larsbutler/geomet',
- description='GeoMet',
+ description='GeoJSON <-> WKT/WKB conversion utilities',
long_description=__doc__,
platforms=['any'],
packages=find_packages(exclude=['geomet.tests', 'geomet.tests.*']),
|
setup:
Added a better package description to setup.py.
|
diff --git a/faq-bundle/tests/EventListener/InsertTagsListenerTest.php b/faq-bundle/tests/EventListener/InsertTagsListenerTest.php
index <HASH>..<HASH> 100644
--- a/faq-bundle/tests/EventListener/InsertTagsListenerTest.php
+++ b/faq-bundle/tests/EventListener/InsertTagsListenerTest.php
@@ -81,9 +81,9 @@ class InsertTagsListenerTest extends \PHPUnit_Framework_TestCase
}
/**
- * Tests that the listener returns an empty string if there is no URL.
+ * Tests that the listener returns an empty string if there is no category model.
*/
- public function testReturnEmptyStringIfNoUrl()
+ public function testReturnEmptyStringIfNoCategoryModel()
{
$listener = new InsertTagsListener($this->mockContaoFramework(false, true));
|
[Faq] Rename a test method.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -14,6 +14,5 @@ RSpec.configure do |config|
config.before(:each) do
Panda.instance_variable_set("@connection", nil)
Panda.instance_variable_set("@cloud", nil)
- Time.now.stub!(:utc).and_return(mock("time", :iso8601 => "2009-11-04T17:54:11+00:00"))
end
end
|
Unnecessary time freeze removed in the specs
TimeCop is already taking care of that in the panda_spec
|
diff --git a/bugwarrior/services/github.py b/bugwarrior/services/github.py
index <HASH>..<HASH> 100644
--- a/bugwarrior/services/github.py
+++ b/bugwarrior/services/github.py
@@ -28,7 +28,7 @@ class GithubClient(ServiceClient):
return user_repos + public_repos
def get_involved_issues(self, username):
- tmpl = "https://api.github.com/search/issues?q=involves%3A{username}&per_page=100"
+ tmpl = "https://api.github.com/search/issues?q=involves%3A{username}%20state%3Aopen&per_page=100"
url = tmpl.format(username=username)
return self._getter(url, subkey='items')
|
Only query for open github PRs (#<I>)
Previously, setting `involved_issues = True` would pull in PRs that were in any
state, including merged PRs. This patch amends the involved issues query to
only search for open PRs.
|
diff --git a/tests.go b/tests.go
index <HASH>..<HASH> 100644
--- a/tests.go
+++ b/tests.go
@@ -221,6 +221,12 @@ func (t *TestSuite) AssertEqual(expected, actual interface{}) {
}
}
+func (t *TestSuite) AssertNotEqual(expected, actual interface{}) {
+ if Equal(expected, actual) {
+ panic(fmt.Errorf("(expected) %v == %v (actual)", expected, actual))
+ }
+}
+
func (t *TestSuite) Assert(exp bool) {
t.Assertf(exp, "Assertion failed")
}
@@ -238,6 +244,13 @@ func (t *TestSuite) AssertContains(s string) {
}
}
+// Assert that the response does not contain the given string.
+func (t *TestSuite) AssertNotContains(s string) {
+ if bytes.Contains(t.ResponseBody, []byte(s)) {
+ panic(fmt.Errorf("Assertion failed. Expected response not to contain %s", s))
+ }
+}
+
// Assert that the response matches the given regular expression.BUG
func (t *TestSuite) AssertContainsRegex(regex string) {
r := regexp.MustCompile(regex)
|
AssertNotEqual and AssertNotContains have been added
|
diff --git a/h5p-default-storage.class.php b/h5p-default-storage.class.php
index <HASH>..<HASH> 100644
--- a/h5p-default-storage.class.php
+++ b/h5p-default-storage.class.php
@@ -408,7 +408,7 @@ class H5PDefaultStorage implements \H5PFileStorage {
*
* @throws Exception Unable to copy the file
*/
- private static function copyFileTree($source, $destination) {
+ public static function copyFileTree($source, $destination) {
if (!self::dirReady($destination)) {
throw new \Exception('unabletocopy');
}
@@ -482,4 +482,13 @@ class H5PDefaultStorage implements \H5PFileStorage {
return TRUE;
}
+
+ /**
+ * Easy helper function for retrieving the editor path
+ *
+ * @return null|string Path to editor files
+ */
+ public function getEditorPath() {
+ return $this->alteditorpath;
+ }
}
|
Make it easier to send files to the editor
HFP-<I>
|
diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py
index <HASH>..<HASH> 100644
--- a/salt/modules/yumpkg.py
+++ b/salt/modules/yumpkg.py
@@ -1910,7 +1910,7 @@ def download(*packages):
to_purge = []
for pkg in packages:
to_purge.extend([os.path.join(CACHE_DIR, x)
- for x in os.listdir(CACHE_DIR)
+ for x in cached_pkgs
if x.startswith('{0}-'.format(pkg))])
for purge_target in set(to_purge):
log.debug('Removing cached package {0}'.format(purge_target))
|
Don't run os.listdir in every loop iteration
Use the cached_pkgs variable instead so you only run it once.
|
diff --git a/input_mask/__init__.py b/input_mask/__init__.py
index <HASH>..<HASH> 100644
--- a/input_mask/__init__.py
+++ b/input_mask/__init__.py
@@ -1 +1 @@
-__version__ = '2.0.0b2'
+__version__ = '2.0.0b3'
diff --git a/input_mask/static/input_mask/js/text_input_mask.js b/input_mask/static/input_mask/js/text_input_mask.js
index <HASH>..<HASH> 100644
--- a/input_mask/static/input_mask/js/text_input_mask.js
+++ b/input_mask/static/input_mask/js/text_input_mask.js
@@ -33,7 +33,11 @@
opts = input.attr('data-money-mask').replace(/"/g, '"'),
opts = JSON.parse(opts);
- input.maskMoney(opts).maskMoney('mask');
+ input.maskMoney(opts);
+
+ if (opts.allowZero) {
+ input.maskMoney('mask');
+ }
}
});
|
Do not display 0 when allowZero is false
|
diff --git a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
index <HASH>..<HASH> 100644
--- a/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
+++ b/extensions/guacamole-auth-ldap/src/main/java/org/apache/guacamole/auth/ldap/conf/ConfigurationService.java
@@ -130,6 +130,15 @@ public class ConfigurationService {
}
+ // Clear cached YAML if it no longer exists
+ else if (cachedConfigurations != null) {
+ long oldLastModified = lastModified.get();
+ if (lastModified.compareAndSet(oldLastModified, 0)) {
+ logger.debug("Clearing cached LDAP configuration from \"{}\" (file no longer exists).", ldapServers);
+ cachedConfigurations = null;
+ }
+ }
+
// Use guacamole.properties if not using YAML
if (cachedConfigurations == null) {
logger.debug("Reading LDAP configuration from guacamole.properties...");
|
GUACAMOLE-<I>: Clear out cached ldap-servers.yml if it is deleted.
|
diff --git a/announce/views.py b/announce/views.py
index <HASH>..<HASH> 100644
--- a/announce/views.py
+++ b/announce/views.py
@@ -41,5 +41,9 @@ def announce(request):
return HttpResponse(app.get_response())
- logger.debug("---------------------------------------")
- return HttpResponseBadRequest()
+ elif request.method != 'POST':
+ return HttpResponseBadRequest('Did not receive an HTTP POST.')
+ elif not check_token_safe(request.POST['token']):
+ return HttpResponseBadRequest('Received an invalid token.')
+ else:
+ HttpResponseBadRequest('Not sure how to handle this request.')
|
more explicit HTTP <I> responses
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,7 @@ setup(
author = 'Paul-Emmanuel Raoul',
author_email = 'skyper@skyplabs.net',
url = 'https://github.com/SkypLabs/python4yahdlc',
+ download_url = 'https://github.com/SkypLabs/python4yahdlc/archive/v1.0.0.zip',
ext_modules = [yahdlc],
test_suite = 'test',
)
|
add download url in 'setup.py' file
|
diff --git a/lib/runner.js b/lib/runner.js
index <HASH>..<HASH> 100644
--- a/lib/runner.js
+++ b/lib/runner.js
@@ -398,6 +398,7 @@ Runner.prototype.run = function(fn){
function uncaught(err){
var runnable = self.currentRunnable;
debug('uncaught exception');
+ if (runnable.failed) return;
runnable.clearTimeout();
err.uncaught = true;
self.fail(runnable, err);
|
Fixed double reporting of uncaught exceptions after timeout. Closes #<I>
if its already failed stop reporting it
|
diff --git a/components/badge/badge.js b/components/badge/badge.js
index <HASH>..<HASH> 100644
--- a/components/badge/badge.js
+++ b/components/badge/badge.js
@@ -5,7 +5,7 @@ import './badge.scss';
/**
* @name Badge
- * @category Forms
+ * @category Components
* @constructor
* @description Provides simple component for badges
* @extends {RingComponent}
|
RG-<I> change "Badge" component category to "Components" because it is not form-specific
Former-commit-id: <I>a<I>e<I>b<I>d<I>c<I>c<I>d<I>c0
|
diff --git a/dataviews/sheetviews.py b/dataviews/sheetviews.py
index <HASH>..<HASH> 100644
--- a/dataviews/sheetviews.py
+++ b/dataviews/sheetviews.py
@@ -7,7 +7,7 @@ from dataviews import Stack, DataHistogram, DataStack, find_minmax
from ndmapping import NdMapping, Dimension
from options import options
from sheetcoords import SheetCoordinateSystem, Slice
-from views import View, Overlay, Annotation, Layout, GridLayout
+from views import View, Overlay, Annotation, GridLayout
class SheetLayer(View):
|
Removed unused Layout import in dataviews/sheetviews.py
|
diff --git a/hep/rules/bd9xx.py b/hep/rules/bd9xx.py
index <HASH>..<HASH> 100644
--- a/hep/rules/bd9xx.py
+++ b/hep/rules/bd9xx.py
@@ -41,6 +41,24 @@ from ...utils import force_single_element, get_recid_from_ref, get_record_ref
RE_VALID_PUBNOTE = re.compile(".*,.*,.*(,.*)?")
+@hep.over('record_affiliations', '^902..')
+@utils.for_each_value
+def record_affiliations(self, key, value):
+ record = get_record_ref(value.get('z'), 'institutions')
+
+ return {
+ 'curated_relation': record is not None,
+ 'record': record,
+ 'value': value.get('a'),
+ }
+
+
+@hep2marc.over('902', '^record_affiliations$')
+@utils.for_each_value
+def record_affiliations2marc(self, key, value):
+ return {'a': value.get('value')}
+
+
@hep.over('document_type', '^980..')
def document_type(self, key, value):
publication_types = [
|
global: bump inspire-schemas to version ~<I>
|
diff --git a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java
index <HASH>..<HASH> 100644
--- a/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java
+++ b/parquet-hadoop/src/main/java/org/apache/parquet/hadoop/CodecFactory.java
@@ -227,7 +227,13 @@ public class CodecFactory implements CompressionCodecFactory {
}
try {
- Class<?> codecClass = Class.forName(codecClassName);
+ Class<?> codecClass;
+ try {
+ codecClass = Class.forName(codecClassName);
+ } catch (ClassNotFoundException e) {
+ // Try to load the class using the job classloader
+ codecClass = configuration.getClassLoader().loadClass(codecClassName);
+ }
codec = (CompressionCodec) ReflectionUtils.newInstance(codecClass, configuration);
CODEC_BY_NAME.put(codecClassName, codec);
return codec;
|
PARQUET-<I>: Use job ClassLoader to load CompressionCodec class (#<I>)
The MR job might be having a different ClassLoader then
the defining ClassLoader of the CodecFactory class.
A CompressionCodec class that is not loadable via the
CodecFactory ClassLoader might be loadable through the
job ClassLoader.
|
diff --git a/petl/io/numpy.py b/petl/io/numpy.py
index <HASH>..<HASH> 100644
--- a/petl/io/numpy.py
+++ b/petl/io/numpy.py
@@ -32,7 +32,7 @@ def toarray(table, dtype=None, count=-1, sample=1000):
>>> a = etl.toarray(table)
>>> a
array([('apples', 1, 2.5), ('oranges', 3, 4.4), ('pears', 7, 0.1)],
- dtype=[('foo', '<U7'), ('bar', '<i8'), ('baz', '<f8')])
+ dtype=(numpy.record, [('foo', '<U7'), ('bar', '<i8'), ('baz', '<f8')]))
>>> # the dtype can be specified as a string
... a = etl.toarray(table, dtype='a4, i2, f4')
>>> a
|
fix doctests for numpy upgrade
|
diff --git a/structr-ui/src/main/resources/structr/js/init.js b/structr-ui/src/main/resources/structr/js/init.js
index <HASH>..<HASH> 100644
--- a/structr-ui/src/main/resources/structr/js/init.js
+++ b/structr-ui/src/main/resources/structr/js/init.js
@@ -1683,6 +1683,7 @@ var Structr = {
var appendToElement = config.appendToElement || element;
var text = config.text || 'No text supplied!';
var toggleElementCss = config.css || {};
+ var elementCss = config.elementCss || {};
var customToggleIcon = config.customToggleIcon || _Icons.information_icon;
var insertAfter = config.insertAfter || false;
var offsetX = config.offsetX || 0;
@@ -1696,6 +1697,7 @@ var Structr = {
}
toggleElement.css(toggleElementCss);
+ appendToElement.css(elementCss);
var helpElement = $('<span class="context-help-text">' + text + '</span>');
|
Feature: Enables user to apply css to element to which an info text is appended
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
var fs = require('fs')
-function EveryPaaS(options) {
+function EveryPaaS() {
this.DOTCLOUD = "dotcloud"
this.HEROKU = "heroku"
this.NODEJITSU = "nodejitsu"
|
EveryPaaS constructor does not take an options object.
|
diff --git a/pylint/checkers/typecheck.py b/pylint/checkers/typecheck.py
index <HASH>..<HASH> 100644
--- a/pylint/checkers/typecheck.py
+++ b/pylint/checkers/typecheck.py
@@ -114,7 +114,14 @@ def _determine_callable(callable_obj):
from_object = new and new.parent.scope().name == 'object'
from_builtins = new and new.root().name == BUILTINS
- if not new or from_object or from_builtins:
+
+ # TODO(cpopa): In an ideal world, we shouldn't do this.
+ # In astroid, some builtins are considered to be imports from
+ # the builtin module. There's issue #96 which should fix this, then
+ # this check could be removed. This is temporary.
+ py2_from_builtins = isinstance(new, astroid.From) and new.modname == BUILTINS
+
+ if not new or from_object or from_builtins or py2_from_builtins:
try:
# Use the last definition of __init__.
callable_obj = callable_obj.local_attr('__init__')[-1]
|
Add temporary fix for the builtins check in _determine_callable_obj.
|
diff --git a/lib/gcli/types/node.js b/lib/gcli/types/node.js
index <HASH>..<HASH> 100644
--- a/lib/gcli/types/node.js
+++ b/lib/gcli/types/node.js
@@ -56,7 +56,9 @@ exports.getWindowHolder = function() {
* NodeListType to allow terminal to tell us which nodes should be highlighted
*/
function onEnter(assignment) {
- assignment.highlighter = new Highlighter(windowHolder.window.document);
+ // TODO: GCLI doesn't support passing a context to notifications of cursor
+ // position, so onEnter/onLeave/onChange are disabled below until we fix this
+ assignment.highlighter = new Highlighter(context.environment.window.document);
assignment.highlighter.nodelist = assignment.conversion.matches;
}
@@ -141,9 +143,9 @@ exports.items = [
return Promise.resolve(reply);
},
- onEnter: onEnter,
- onLeave: onLeave,
- onChange: onChange
+ // onEnter: onEnter,
+ // onLeave: onLeave,
+ // onChange: onChange
},
{
// The 'nodelist' type is a CSS expression that refers to a node list
@@ -217,8 +219,8 @@ exports.items = [
return Promise.resolve(reply);
},
- onEnter: onEnter,
- onLeave: onLeave,
- onChange: onChange
+ // onEnter: onEnter,
+ // onLeave: onLeave,
+ // onChange: onChange
}
];
|
runat-<I>: Remove onEnter/onLeave/onChange notification
The idea was that we could highlight nodes when command line cursor was
'inside' the relevant argument. But it's not working for several
reasons:
* It needs remoting (and this could be a perf issue)
* We've not hooked it up to the new multiple node highlighter
* The requirement to have context.environment.window hooked up is making
things worse
So I'm disabling it here.
|
diff --git a/bookstore/handlers.py b/bookstore/handlers.py
index <HASH>..<HASH> 100644
--- a/bookstore/handlers.py
+++ b/bookstore/handlers.py
@@ -69,7 +69,7 @@ class BookstorePublishHandler(APIHandler):
self.log.info("Processing published write of %s", path)
await client.put_object(Bucket=self.bookstore_settings.s3_bucket,
Key=file_key,
- Body=json.dumps(content).encode('utf-8'))
+ Body=json.dumps(content))
self.log.info("Done with published write of %s", path)
# Likely implementation:
|
undo bytes encoding for put_object
|
diff --git a/lib/support/cli.js b/lib/support/cli.js
index <HASH>..<HASH> 100644
--- a/lib/support/cli.js
+++ b/lib/support/cli.js
@@ -592,6 +592,12 @@ module.exports.parseCommandLine = function parseCommandLine() {
describe:
'How long time to wait (in seconds) if the androidBatteryTemperatureWaitTimeInSeconds is not met before the next try'
})
+ .option('androidVerifyNetwork', {
+ type: 'boolean',
+ default: false,
+ describe:
+ 'Before a test start, verify that the device has a Internet connection by pinging 8.8.8.8 (or a configurable domain with --androidPingAddress)'
+ })
/** Process start time. Android-only for now. */
.option('processStartTime', {
type: 'boolean',
|
Verify internet connection before you start a test. (#<I>)
|
diff --git a/lib/podio/models/conversation.rb b/lib/podio/models/conversation.rb
index <HASH>..<HASH> 100644
--- a/lib/podio/models/conversation.rb
+++ b/lib/podio/models/conversation.rb
@@ -121,6 +121,19 @@ class Podio::Conversation < ActivePodio::Base
Podio.connection.delete("/conversation/#{conversation_id}/read").status
end
+ # @see https://developers.podio.com/doc/conversations/star-conversation-35106944
+ def star(conversation_id)
+ response = Podio.connection.post do |req|
+ req.url "/conversation/#{conversation_id}/star"
+ end
+ response.status
+ end
+
+ # @see https://developers.podio.com/doc/conversations/unstar-conversation-35106990
+ def unstar(conversation_id)
+ Podio.connection.delete("/conversation/#{conversation_id}/star").status
+ end
+
def get_omega_auth_tokens
response = Podio.connection.post do |req|
req.url '/conversation/omega/access_token'
|
Starring and unstaring conversations support.
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,20 @@
#!/usr/bin/env python
+setup_args = {}
+
try:
from setuptools import setup
from setuptools.extension import Extension
+ setup_args.update(install_requires=[
+ 'Cython >= 0.11',
+ 'numpy >= 1.5.1',
+ #'scipy >= 0.6',
+ ])
except ImportEror:
from distutils.core import setup
from distutils.extension import Extension
-setup_args = dict(
+setup_args.update(
name='biofrills',
version='0.0.0-dev',
description='Bio scripts, parsers and utilities',
|
setup.py: added dependencies for easy_install
|
diff --git a/explauto/interest_model/random.py b/explauto/interest_model/random.py
index <HASH>..<HASH> 100644
--- a/explauto/interest_model/random.py
+++ b/explauto/interest_model/random.py
@@ -141,15 +141,9 @@ class MiscRandomInterest(RandomInterest):
interest_models = {'random': (RandomInterest, {'default': {}}),
- 'miscRandom_local': (MiscRandomInterest, {'default':
+ 'misc_random': (MiscRandomInterest, {'default':
{'competence_measure': competence_dist,
'win_size': 100,
'competence_mode': 'knn',
'k': 100,
- 'progress_mode': 'local'}}),
- 'miscRandom_global': (MiscRandomInterest, {'default':
- {'competence_measure': competence_dist,
- 'win_size': 100,
- 'competence_mode': 'knn',
- 'k': 100,
- 'progress_mode': 'global'}})}
+ 'progress_mode': 'local'}})}
|
simplified default config of miscRandom interest model
|
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -585,8 +585,8 @@ for i in xrange(42):
""")
out = []
- for line in python(py.name, _for=True): out.append(line)
- self.assertTrue(len(out) == 42)
+ for line in python(py.name, _for=True): out.append(int(line.strip()))
+ self.assertTrue(len(out) == 42 and sum(out) == 861)
def test_nonblocking_for(self):
|
being a little more specific with test_for_generator
|
diff --git a/TYPO3.Flow/Classes/Package/Manager.php b/TYPO3.Flow/Classes/Package/Manager.php
index <HASH>..<HASH> 100644
--- a/TYPO3.Flow/Classes/Package/Manager.php
+++ b/TYPO3.Flow/Classes/Package/Manager.php
@@ -377,6 +377,9 @@ class Manager implements \F3\FLOW3\Package\ManagerInterface {
$childFilename = $childFileInfo->getFilename();
if ($childFilename[0] !== '.' && $childFilename !== 'FLOW3') {
$packagePath = \F3\FLOW3\Utility\Files::getUnixStylePath($childFileInfo->getPathName()) . '/';
+ if (isset($this->packages[$childFilename])) {
+ throw new \F3\FLOW3\Package\Exception\DuplicatePackage('Detected a duplicate package, remove either "' . $this->packages[$childFilename]->getPackagePath() . '" or "' . $packagePath . '".', 1253716811);
+ }
$this->packages[$childFilename] = $this->objectFactory->create('F3\FLOW3\Package\Package', $childFilename, $packagePath);
}
}
|
[+FEATURE] FLOW3 (Package): Duplicate packages are now detected and an exception is thrown, resolves #<I>.
Original-Commit-Hash: c7b7b5db<I>c<I>da<I>fba0d<I>a4f5b
|
diff --git a/libkbfs/kbfs_ops.go b/libkbfs/kbfs_ops.go
index <HASH>..<HASH> 100644
--- a/libkbfs/kbfs_ops.go
+++ b/libkbfs/kbfs_ops.go
@@ -261,13 +261,17 @@ func (fs *KBFSOpsStandard) execReadInChannel(
func (fs *KBFSOpsStandard) GetRootMD(dir DirId) (md *RootMetadata, err error) {
// don't check read permissions here -- anyone should be able to read
// the MD to determine whether there's a public subdir or not
+ var exists bool
fs.execReadInChannel(dir, func(rtype reqType) error {
md, err = fs.getMDInChannel(Path{TopDir: dir}, rtype)
+ // Type defaults to File, so if it was set to Dir then MD already exists
+ if err == nil && md.data.Dir.Type == Dir {
+ exists = true
+ }
return err
})
- // Type defaults to File, so if it was set to Dir then MD already exists
- if err != nil || md.data.Dir.Type == Dir {
+ if err != nil || exists {
return
}
|
kbfs_ops: fix data race found by 'go test -race'
Don't inspect the MD outside of the scheduler.
|
diff --git a/beets/mediafile.py b/beets/mediafile.py
index <HASH>..<HASH> 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -398,8 +398,9 @@ class StorageStyle(object):
self.float_places = float_places
# Convert suffix to correct string type.
- if self.suffix and self.as_type is unicode:
- self.suffix = self.as_type(self.suffix)
+ if self.suffix and self.as_type is unicode \
+ and not isinstance(self.suffix, unicode):
+ self.suffix = self.suffix.decode('utf8')
# Getter.
|
Fix bytes/str with unicode-nazi
Further cleaning will require setting unicode_literals on plugins
Original: beetbox/beets@<I>c
|
diff --git a/src/raven.js b/src/raven.js
index <HASH>..<HASH> 100644
--- a/src/raven.js
+++ b/src/raven.js
@@ -1272,8 +1272,12 @@ Raven.prototype = {
// borrowed from: https://github.com/angular/angular.js/pull/13945/files
var chrome = _window.chrome;
var isChromePackagedApp = chrome && chrome.app && chrome.app.runtime;
- var hasPushState = !isChromePackagedApp && _window.history && history.pushState;
- if (autoBreadcrumbs.location && hasPushState) {
+ var hasPushAndReplaceState =
+ !isChromePackagedApp &&
+ _window.history &&
+ history.pushState &&
+ history.replaceState;
+ if (autoBreadcrumbs.location && hasPushAndReplaceState) {
// TODO: remove onpopstate handler on uninstall()
var oldOnPopState = _window.onpopstate;
_window.onpopstate = function() {
@@ -1302,6 +1306,7 @@ Raven.prototype = {
};
fill(history, 'pushState', historyReplacementFunction, wrappedBuiltIns);
+ fill(history, 'replaceState', historyReplacementFunction, wrappedBuiltIns);
}
if (autoBreadcrumbs.console && 'console' in _window && console.log) {
|
Check for replaceState and fill it
|
diff --git a/src/subscription/mapAsyncIterator.js b/src/subscription/mapAsyncIterator.js
index <HASH>..<HASH> 100644
--- a/src/subscription/mapAsyncIterator.js
+++ b/src/subscription/mapAsyncIterator.js
@@ -24,10 +24,16 @@ export function mapAsyncIterator<T, U>(
};
}
- function mapResult(result: IteratorResult<T, void>) {
- return result.done
- ? result
- : asyncMapValue(result.value, callback).then(iteratorResult, abruptClose);
+ async function mapResult(result: IteratorResult<T, void>) {
+ if (result.done) {
+ return result;
+ }
+
+ try {
+ return { value: await callback(result.value), done: false };
+ } catch (callbackError) {
+ return abruptClose(callbackError);
+ }
}
function mapReject(error: mixed) {
@@ -60,14 +66,3 @@ export function mapAsyncIterator<T, U>(
},
}: $FlowFixMe);
}
-
-function asyncMapValue<T, U>(
- value: T,
- callback: (T) => PromiseOrValue<U>,
-): Promise<U> {
- return new Promise((resolve) => resolve(callback(value)));
-}
-
-function iteratorResult<T>(value: T): IteratorResult<T, void> {
- return { value, done: false };
-}
|
mapAsyncIterator: simplify mapResult (#<I>)
|
diff --git a/lib/rnes/ppu_bus.rb b/lib/rnes/ppu_bus.rb
index <HASH>..<HASH> 100644
--- a/lib/rnes/ppu_bus.rb
+++ b/lib/rnes/ppu_bus.rb
@@ -28,9 +28,9 @@ module Rnes
when 0x3F00..0x3F1F
@video_ram.read(address - 0x2000)
when 0x3F20..0x3FFF
- read(address - 0x20) # mirror to 0x3F00..0x3F1F
+ read(address - 0x20)
when 0x4000..0xFFFF
- read(address - 0x4000) # mirror to 0x0000..0x3FFF
+ read(address - 0x4000)
else
raise ::Rnes::Errors::InvalidPpuBusAddressError, address
end
|
Remove verbose comment from PPU bus
|
diff --git a/components.js b/components.js
index <HASH>..<HASH> 100644
--- a/components.js
+++ b/components.js
@@ -1 +1,2 @@
-exports.EasyFormsComponent = require('./lib/easy-forms.component').EasyFormsComponent;
\ No newline at end of file
+exports.EasyFormsComponent = require('./lib/easy-forms.component').EasyFormsComponent;
+exports.EasyFormData = require('./lib/data.interface').EasyFormData;
\ No newline at end of file
|
fix: added EasyFormData interface to d.ts
|
diff --git a/speech/google/cloud/speech/transcript.py b/speech/google/cloud/speech/transcript.py
index <HASH>..<HASH> 100644
--- a/speech/google/cloud/speech/transcript.py
+++ b/speech/google/cloud/speech/transcript.py
@@ -38,7 +38,7 @@ class Transcript(object):
:rtype: :class:`Transcript`
:returns: Instance of ``Transcript``.
"""
- return cls(transcript['transcript'], transcript['confidence'])
+ return cls(transcript.get('transcript'), transcript.get('confidence'))
@classmethod
def from_pb(cls, transcript):
diff --git a/speech/unit_tests/test_transcript.py b/speech/unit_tests/test_transcript.py
index <HASH>..<HASH> 100644
--- a/speech/unit_tests/test_transcript.py
+++ b/speech/unit_tests/test_transcript.py
@@ -31,3 +31,12 @@ class TestTranscript(unittest.TestCase):
self.assertEqual('how old is the Brooklyn Bridge',
transcript.transcript)
self.assertEqual(0.98267895, transcript.confidence)
+
+ def test_from_api_repr_with_no_confidence(self):
+ data = {
+ 'transcript': 'testing 1 2 3'
+ }
+
+ transcript = self._getTargetClass().from_api_repr(data)
+ self.assertEqual(transcript.transcript, data['transcript'])
+ self.assertIsNone(transcript.confidence)
|
Fixes issue when max_alternatives is more than 1 and confidence is missing.
|
diff --git a/jcvi/formats/genbank.py b/jcvi/formats/genbank.py
index <HASH>..<HASH> 100644
--- a/jcvi/formats/genbank.py
+++ b/jcvi/formats/genbank.py
@@ -49,11 +49,6 @@ class MultiGenBank(BaseFile):
for f in rf:
self.print_gffline(gff_fw, f, seqid)
nfeats += 1
-
- for sf in f.sub_features:
- self.print_gffline(gff_fw, sf, seqid, parent=f)
- nfeats += 1
-
nrecs += 1
logging.debug(
|
Remove .sub_features extraction as no longer needed (thanks @chen1i6c<I>, #<I>) (#<I>)
|
diff --git a/lesscpy/lessc/scope.py b/lesscpy/lessc/scope.py
index <HASH>..<HASH> 100644
--- a/lesscpy/lessc/scope.py
+++ b/lesscpy/lessc/scope.py
@@ -90,6 +90,8 @@ class Scope(list):
"""
if isinstance(name, tuple):
name = name[0]
+ if name.startswith('@{'):
+ name = '@' + name[2:-1]
i = len(self)
while i >= 0:
i -= 1
@@ -176,6 +178,11 @@ class Scope(list):
if var is False:
raise SyntaxError('Unknown variable %s' % name)
name = '@' + utility.destring(var.value[0])
+ if name.startswith('@{'):
+ var = self.variables('@' + name[2:-1])
+ if var is False:
+ raise SyntaxError('Unknown escaped variable %s' % name)
+ name = var.name
var = self.variables(name)
if var is False:
raise SyntaxError('Unknown variable %s' % name)
|
Support swapping "@{...}" type variables
These only occur in interpolated strings (~'...' or ~"...").
|
diff --git a/src/model.js b/src/model.js
index <HASH>..<HASH> 100644
--- a/src/model.js
+++ b/src/model.js
@@ -3,8 +3,9 @@
module.exports = function (ConvexModel, Firebase, $q, convexConfig) {
ConvexModel.prototype.$ref = function () {
+ var pathOverride = this.$firebase && this.$firebase.path;
return new Firebase(convexConfig.firebase)
- .child(this.$firebase.path.call(this));
+ .child(pathOverride ? this.$firebase.path.call(this) : this.$path(this.id));
};
function toPromise (ref) {
diff --git a/test/model.js b/test/model.js
index <HASH>..<HASH> 100644
--- a/test/model.js
+++ b/test/model.js
@@ -20,7 +20,17 @@ module.exports = function () {
describe('#$ref', function () {
- it('can generate a new Firebase reference', function () {
+ it('can generate a reference using $path', function () {
+ model.$path = function () {
+ return '/user/ben';
+ };
+ expect(model.$ref().currentPath).to.equal('Mock://user/ben');
+ });
+
+ it('can generate a reference using a firebase path override', function () {
+ model.$path = function () {
+ return '$path';
+ };
model.$firebase = {
path: function () {
return '/user/ben';
|
Use $path as the default and then fall back to $firebase#path
|
diff --git a/lib/aruba/api.rb b/lib/aruba/api.rb
index <HASH>..<HASH> 100644
--- a/lib/aruba/api.rb
+++ b/lib/aruba/api.rb
@@ -410,6 +410,8 @@ module Aruba
# @param [true,false] expect_presence
# Should the given paths be present (true) or absent (false)
def check_file_presence(paths, expect_presence = true)
+ stop_processes!
+
warn('The use of "check_file_presence" is deprecated. Use "expect().to be_existing_file or expect(all_paths).to match_path_pattern() instead" ')
Array(paths).each do |path|
|
Fixed expand_path for check_presence
|
diff --git a/app/medication/edit/controller.js b/app/medication/edit/controller.js
index <HASH>..<HASH> 100644
--- a/app/medication/edit/controller.js
+++ b/app/medication/edit/controller.js
@@ -82,6 +82,7 @@ export default AbstractEditController.extend(InventorySelection, PatientId, Pati
},
_addNewPatient: function() {
+ this.displayAlert('Please Wait','Creating new patient...Please wait..');
this._getNewPatientId().then(function(friendlyId) {
var patientTypeAhead = this.get('patientTypeAhead'),
nameParts = patientTypeAhead.split(' '),
|
Added alert when creating new patient from medication
Added alert for slow connections
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,6 +2,7 @@
$:.push(File.expand_path("../../lib", __FILE__))
+require "fileutils"
require "fakeweb"
require "uri"
require "ryodo"
@@ -22,7 +23,7 @@ end
RYODO_SPEC_ROOT = File.expand_path("..", __FILE__)
RYODO_TMP_ROOT = File.expand_path("../../tmp/spec", __FILE__)
-Dir.mkdir RYODO_TMP_ROOT unless File.exists?(RYODO_TMP_ROOT)
+FileUtils.mkdir_p RYODO_TMP_ROOT unless File.exists?(RYODO_TMP_ROOT)
FakeWeb.register_uri(:get,
Ryodo::PUBLIC_SUFFIX_DATA_URI,
|
Fix tmp/spec folder issue while test run
|
diff --git a/lib/async.js b/lib/async.js
index <HASH>..<HASH> 100644
--- a/lib/async.js
+++ b/lib/async.js
@@ -375,7 +375,7 @@
}, true);
};
if (ready()) {
- task[task.length - 1](taskCallback);
+ task[task.length - 1](taskCallback, results);
}
else {
var listener = function () {
|
Fix bug in auto. Results wern't being passed to functions that were immediately ready to run.
|
diff --git a/publish/index.js b/publish/index.js
index <HASH>..<HASH> 100644
--- a/publish/index.js
+++ b/publish/index.js
@@ -151,7 +151,7 @@ let package = require("../package.json");
// Add & Commit files to Git
const gitCommitPackageSub = ora("Committing files to Git").start();
- await git.commit(`Bumping version to ${results.version} for ${workspacePackage} package`, subPackageFiles.map((file) => path.join(__dirname, "..", file)));
+ await git.commit(`Bumping version to ${results.version} for ${workspacePackage} package`, [...subPackageFiles, ...packageFiles].map((file) => path.join(__dirname, "..", file)));
gitCommitPackageSub.succeed("Committed files to Git");
}
|
Trying to fix what is included in publish commit
|
diff --git a/framework/core/js/src/forum/compat.js b/framework/core/js/src/forum/compat.js
index <HASH>..<HASH> 100644
--- a/framework/core/js/src/forum/compat.js
+++ b/framework/core/js/src/forum/compat.js
@@ -72,6 +72,7 @@ import DiscussionPageResolver from './resolvers/DiscussionPageResolver';
import BasicEditorDriver from '../common/utils/BasicEditorDriver';
import routes from './routes';
import ForumApplication from './ForumApplication';
+import isSafariMobile from './utils/isSafariMobile';
export default Object.assign(compat, {
'utils/PostControls': PostControls,
@@ -83,6 +84,7 @@ export default Object.assign(compat, {
'utils/UserControls': UserControls,
'utils/Pane': Pane,
'utils/BasicEditorDriver': BasicEditorDriver,
+ 'utils/isSafariMobile': isSafariMobile,
'states/ComposerState': ComposerState,
'states/DiscussionListState': DiscussionListState,
'states/GlobalSearchState': GlobalSearchState,
|
feat: export `utils/isSafariMobile` (#<I>)
|
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
index <HASH>..<HASH> 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/helper.js
@@ -26,12 +26,9 @@ const DriverRemoteConnection = require('../lib/driver/driver-remote-connection')
exports.getConnection = function getConnection(traversalSource) {
return new DriverRemoteConnection('ws://localhost:45940/gremlin', { traversalSource: traversalSource });
-<<<<<<< HEAD
-=======
};
exports.getSecureConnectionWithAuthenticator = function getConnection(traversalSource) {
const authenticator = new SaslAuthenticator({ username: 'stephen', password: 'password' });
- return new DriverRemoteConnection('wss://localhost:45941/gremlin', { traversalSource: traversalSource, authenticator: authenticator, rejectUnauthorized: false });
->>>>>>> 65de11c3c8... Submit can accept an existing requestId.
+ return new DriverRemoteConnection('ws://localhost:45941/gremlin', { traversalSource: traversalSource, authenticator: authenticator, rejectUnauthorized: false });
};
\ No newline at end of file
|
Switched from TLS sockets to normal socket on connection to gremlin secure server.
|
diff --git a/sqlalchemyutils.py b/sqlalchemyutils.py
index <HASH>..<HASH> 100644
--- a/sqlalchemyutils.py
+++ b/sqlalchemyutils.py
@@ -28,6 +28,7 @@ from sqlalchemy.orm import class_mapper, properties
from sqlalchemy.types import TypeDecorator, TEXT, LargeBinary
from sqlalchemy.sql.expression import FunctionElement
from invenio.intbitset import intbitset
+from invenio.errorlib import register_exception
from invenio.dbquery import serialize_via_marshal, deserialize_via_marshal
from invenio.hashutils import md5
@@ -249,7 +250,10 @@ class PasswordComparator(Comparator):
def autocommit_on_checkin(dbapi_con, con_record):
"""Calls autocommit on raw mysql connection for fixing bug in MySQL 5.5"""
- dbapi_con.autocommit(True)
+ try:
+ dbapi_con.autocommit(True)
+ except:
+ register_exception()
## Possibly register globally.
#event.listen(Pool, 'checkin', autocommit_on_checkin)
|
SQLAlchemy: fix for MySQL gone exception handling
* Addresses problem with unclear exception when MySQL is down.
(closes #<I>)
|
diff --git a/server.py b/server.py
index <HASH>..<HASH> 100644
--- a/server.py
+++ b/server.py
@@ -7,24 +7,22 @@ class GNTPServer(SocketServer.TCPServer):
class GNTPHandler(SocketServer.StreamRequestHandler):
def read(self):
- bufferSleep = 0.01
bufferLength = 2048
- time.sleep(bufferSleep) #Let the buffer fill up a bit (hack)
buffer = ''
while(1):
data = self.request.recv(bufferLength)
if self.server.growl_debug:
print 'Reading',len(data)
buffer = buffer + data
- if len(data) < bufferLength: break
- time.sleep(bufferSleep) #Let the buffer fill up a bit (hack)
+ if len(data) < bufferLength and buffer.endswith('\r\n\r\n'):
+ break
if self.server.growl_debug:
print '<Reading>\n',buffer,'\n</Reading>'
return buffer
def write(self,msg):
if self.server.growl_debug:
print '<Writing>\n',msg,'\n</Writing>'
- self.request.send(msg)
+ self.request.sendall(msg)
def handle(self):
reload(gntp)
self.data = self.read()
|
Slightly better checks for the end of message.
|
diff --git a/jave-core/src/main/java/ws/schild/jave/MultimediaObject.java b/jave-core/src/main/java/ws/schild/jave/MultimediaObject.java
index <HASH>..<HASH> 100644
--- a/jave-core/src/main/java/ws/schild/jave/MultimediaObject.java
+++ b/jave-core/src/main/java/ws/schild/jave/MultimediaObject.java
@@ -223,7 +223,8 @@ public class MultimediaObject {
Pattern p3 = Pattern.compile(
"^\\s*Stream #\\S+: ((?:Audio)|(?:Video)|(?:Data)): (.*)\\s*$",
Pattern.CASE_INSENSITIVE);
- Pattern p4 = Pattern.compile(
+ @SuppressWarnings("unused")
+ Pattern p4 = Pattern.compile(
"^\\s*Metadata:",
Pattern.CASE_INSENSITIVE);
MultimediaInfo info = null;
|
Keeping this around since it might be needed in the future.
|
diff --git a/ConfigurationUrlParser.php b/ConfigurationUrlParser.php
index <HASH>..<HASH> 100644
--- a/ConfigurationUrlParser.php
+++ b/ConfigurationUrlParser.php
@@ -124,6 +124,8 @@ class ConfigurationUrlParser
*
* @param string $url
* @return array
+ *
+ * @throws \InvalidArgumentException
*/
protected function parseUrl($url)
{
diff --git a/Testing/Fakes/QueueFake.php b/Testing/Fakes/QueueFake.php
index <HASH>..<HASH> 100644
--- a/Testing/Fakes/QueueFake.php
+++ b/Testing/Fakes/QueueFake.php
@@ -367,6 +367,8 @@ class QueueFake extends QueueManager implements Queue
* @param string $method
* @param array $parameters
* @return mixed
+ *
+ * @throws \BadMethodCallException
*/
public function __call($method, $parameters)
{
|
add missing docblocks (#<I>)
|
diff --git a/lib/codeme/config.rb b/lib/codeme/config.rb
index <HASH>..<HASH> 100644
--- a/lib/codeme/config.rb
+++ b/lib/codeme/config.rb
@@ -6,6 +6,7 @@ module Codeme
attr_accessor :default_config
def method_missing(name, *args, &block)
+ p name
(@instance ||= self.new).send(name, *args, &block)
end
@@ -13,6 +14,10 @@ module Codeme
self.default_config ||= {}
self.default_config[name.to_sym] = default
end
+
+ def [](name)
+ send(name.to_sym)
+ end
end
def initialize
diff --git a/spec/codeme/config_spec.rb b/spec/codeme/config_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/codeme/config_spec.rb
+++ b/spec/codeme/config_spec.rb
@@ -43,9 +43,19 @@ RSpec.describe Codeme::Config do
end
it "support class level instance" do
- Codeme::Config.register(:apple)
- expect(subject.accept?(:apple)).to be true
- Codeme::Config.reset_default!
+ klass = Class.new(Codeme::Config) do
+ register :apple, true
+ end
+ expect(klass.new.accept?(:apple)).to be true
+ end
+
+ it "support class level accessor" do
+ klass = Class.new(Codeme::Config) do
+ register :shared, true
+ end
+ expect(klass[:shared]).to be true
+ klass[:shared] = false
+ expect(klass[:shared]).to be false
end
end
|
Add class level accessor for Config
|
diff --git a/test/Base/BaseTestCase.php b/test/Base/BaseTestCase.php
index <HASH>..<HASH> 100644
--- a/test/Base/BaseTestCase.php
+++ b/test/Base/BaseTestCase.php
@@ -2,7 +2,7 @@
namespace RcmTest\Base;
-require_once __DIR__ . '/Zf2TestCase.php';
+require_once __DIR__ . '/ZF2TestCase.php';
use Rcm\Entity\Country;
use Rcm\Entity\Language;
|
PROD-<I> Use commas for decimals in euro and other countries - add unit tests
|
diff --git a/src/MetaModels/DcGeneral/Events/Table/FilterSetting/DrawSetting.php b/src/MetaModels/DcGeneral/Events/Table/FilterSetting/DrawSetting.php
index <HASH>..<HASH> 100644
--- a/src/MetaModels/DcGeneral/Events/Table/FilterSetting/DrawSetting.php
+++ b/src/MetaModels/DcGeneral/Events/Table/FilterSetting/DrawSetting.php
@@ -212,10 +212,6 @@ class DrawSetting
sprintf('%s[%s][%s]', $event::NAME, $environment->getDataDefinition()->getName(), $type),
$event
);
- $environment->getEventDispatcher()->dispatch(
- sprintf('%s[%s]', $event::NAME, $environment->getDataDefinition()->getName()),
- $event
- );
if (!$event->isPropagationStopped()) {
// Handle with default drawing if no one wants to handle.
|
Fix endless recursion in drawing filter settings.
|
diff --git a/src/Orders/OrdersStatus.php b/src/Orders/OrdersStatus.php
index <HASH>..<HASH> 100644
--- a/src/Orders/OrdersStatus.php
+++ b/src/Orders/OrdersStatus.php
@@ -32,4 +32,28 @@ class OrdersStatus {
return $result;
}
+ /**
+ * [RO] Confirma o comanda existenta (https://github.com/celdotro/marketplace/wiki/Confirmare-comanda)
+ * [EN] Confirms an existing order (https://github.com/celdotro/marketplace/wiki/Confirm-order)
+ * @param $cmd
+ * @return mixed
+ * @throws \Exception
+ */
+ public function confirmOrder($cmd){
+ // Sanity check
+ if(!isset($cmd) || !is_int($cmd)) throw new \Exception('Specificati comanda');
+
+ // Set method and action
+ $method = 'orders';
+ $action = 'confirmOrder';
+
+ // Set data
+ $data = array('order' => $cmd);
+
+ // Send request and retrieve response
+ $result = Dispatcher::send($method, $action, $data);
+
+ return $result;
+ }
+
}
\ No newline at end of file
|
Added method for order confirmation
modified: src/Orders/OrdersStatus.php
|
diff --git a/programs/demag_gui.py b/programs/demag_gui.py
index <HASH>..<HASH> 100755
--- a/programs/demag_gui.py
+++ b/programs/demag_gui.py
@@ -5025,8 +5025,10 @@ class Demag_GUI(wx.Frame):
mb = self.GetMenuBar()
am = mb.GetMenu(2)
submenu_toggle_mean_display = wx.Menu()
- lines = ["m_%s_toggle_mean = submenu_toggle_mean_display.AppendCheckItem(-1, '&%s', '%s'); self.Bind(wx.EVT_MENU, self.on_menu_toggle_mean, m_%s_toggle_mean)"%(f.replace(' ',''),f.replace(' ',''),f.replace(' ',''),f.replace(' ','')) for f in self.all_fits_list]
+ f_name = f.replace(' ','').replace('-','_')
+ lines = ["m_%s_toggle_mean = submenu_toggle_mean_display.AppendCheckItem(-1, '&%s', '%s'); self.Bind(wx.EVT_MENU, self.on_menu_toggle_mean, m_%s_toggle_mean)"%(f_name,f_name,f_name,f_name) for f in self.all_fits_list]
+ pdb.set_trace()
for line in lines: exec(line)
am.DeleteItem(am.GetMenuItems()[3])
|
fixed error with dashed fit names crashing GUI
|
diff --git a/test/airbrake_tasks_test.rb b/test/airbrake_tasks_test.rb
index <HASH>..<HASH> 100644
--- a/test/airbrake_tasks_test.rb
+++ b/test/airbrake_tasks_test.rb
@@ -92,12 +92,6 @@ class AirbrakeTasksTest < Test::Unit::TestCase
end
end
- before_should "use the :api_key param if it's passed in." do
- @options[:api_key] = "value"
- @post.expects(:set_form_data).
- with(has_entries("api_key" => "value"))
- end
-
before_should "puts the response body on success" do
AirbrakeTasks.expects(:puts).with("body")
@http_proxy.expects(:request).with(any_parameters).returns(successful_response('body'))
@@ -125,7 +119,7 @@ class AirbrakeTasksTest < Test::Unit::TestCase
context "in a configured project with custom host" do
setup do
- Airbrake.configure do |config|
+ Airbrake.configure do |config|
config.api_key = "1234123412341234"
config.host = "custom.host"
end
|
Remove test that checks availability of passing api_key opt
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.