hash
stringlengths
40
40
diff
stringlengths
131
26.7k
message
stringlengths
7
694
project
stringlengths
5
67
split
stringclasses
1 value
diff_languages
stringlengths
2
24
75a0ed4175f26757837460b7d3ad8e8d0b8fd3ca
diff --git a/src/system/modules/metamodels/GeneralCallbackMetaModel.php b/src/system/modules/metamodels/GeneralCallbackMetaModel.php index <HASH>..<HASH> 100644 --- a/src/system/modules/metamodels/GeneralCallbackMetaModel.php +++ b/src/system/modules/metamodels/GeneralCallbackMetaModel.php @@ -86,8 +86,7 @@ class GeneralCallbackMetaModel extends GeneralCallbackDefault { $objTemplate = new MetaModelTemplate($objView->get('template')); } else { - // fallback to default. - $objTemplate = new MetaModelTemplate('be_metamodel_full'); + return 'No rendersetting defined.'; } if ($objMetaModel->hasVariants() && !$objNativeItem->isVariantBase())
show error if no rendersettings defined for backend, as discussed with David Maack.
MetaModels_core
train
php
9a43d36a4ce6dc1d84e8e90d505ddb6edcf33498
diff --git a/greenhouse/io/sockets.py b/greenhouse/io/sockets.py index <HASH>..<HASH> 100644 --- a/greenhouse/io/sockets.py +++ b/greenhouse/io/sockets.py @@ -96,14 +96,15 @@ class _InnerSocket(object): raise socket.error(*error.args) raise - yield - try: - poller.unregister(self, counter) - except EnvironmentError, error: - if error.args and error.args[0] in errno.errorcode: - raise socket.error(*error.args) - raise + yield + finally: + try: + poller.unregister(self, counter) + except EnvironmentError, error: + if error.args and error.args[0] in errno.errorcode: + raise socket.error(*error.args) + raise def accept(self): with self._registered('re'):
ensure basically that the __exit__ gets run in socket registration context managers
teepark_greenhouse
train
py
fb4df386c0aa2277544139944e08a9c5a54b2785
diff --git a/library/CMService/Newrelic.php b/library/CMService/Newrelic.php index <HASH>..<HASH> 100644 --- a/library/CMService/Newrelic.php +++ b/library/CMService/Newrelic.php @@ -47,6 +47,24 @@ class CMService_Newrelic extends CM_Class_Abstract { } /** + * @param string $name + * @param Closure $closure + * @return mixed + * @throws Exception + */ + public function runAsTransaction($name, Closure $closure) { + $this->startTransaction($name); + try { + $returnValue = $closure(); + $this->endTransaction(); + return $returnValue; + } catch (Exception $ex) { + $this->endTransaction(); + throw $ex; + } + } + + /** * @param string $name */ public function setNameTransaction($name) {
Introduce Newrelic's runAsTransaction
cargomedia_cm
train
php
0a7144325c75473ba7acafb44c09dd1e6d55cd12
diff --git a/widgetsnbextension/src/widget_output.js b/widgetsnbextension/src/widget_output.js index <HASH>..<HASH> 100644 --- a/widgetsnbextension/src/widget_output.js +++ b/widgetsnbextension/src/widget_output.js @@ -66,7 +66,7 @@ var OutputView = widgets.DOMWidgetView.extend({ }, render: function(){ - let renderOutput = (outputArea) => { + var renderOutput = function(outputArea) { this.output_area = new outputArea.OutputArea({ selector: this.el, config: this.options.cell.config, @@ -95,7 +95,7 @@ var OutputView = widgets.DOMWidgetView.extend({ requirejs(["notebook/js/outputarea"], renderOutput) } else { // Notebook 5.x - requirejs(["notebook"], (notebookApp) => { + requirejs(["notebook"], function(notebookApp) { var outputArea = notebookApp["notebook/js/outputarea"]; renderOutput(outputArea); });
remove more of ES<I>/ES6 features
jupyter-widgets_ipywidgets
train
js
88570c110ad36a8bfb140233dd042787e312865a
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -156,10 +156,13 @@ class kmsSecretsPlugin { vars.populateService(this.options); const moduleConfig = inited.custom['serverless-kms-secrets'] || {}; + + const stage = this.options.stage || inited.provider.stage; + const region = this.options.region || inited.provider.region; const configFile = moduleConfig.secretsFile - || `kms-secrets.${inited.provider.stage}.${inited.provider.region}.yml`; + || `kms-secrets.${stage}.${region}.yml`; myModule.serverless.cli.log(`Decrypting secrets from ${configFile}`); readFile(configFile) @@ -167,7 +170,7 @@ class kmsSecretsPlugin { const names = this.options.name ? [this.options.name] : Object.keys(secrets); names.forEach((varName) => { if (secrets[varName]) { - AWS.config.update({ region: inited.provider.region }); + AWS.config.update({ region }); const kms = new AWS.KMS(); kms.decrypt({ CiphertextBlob: Buffer(secrets[varName], 'base64'), // eslint-disable-line new-cap
Fix cli options not working with decrypt. For example, calling sls decrypt with -s prod didn't have any effect and decryption was performed using dev stage. This fixes it.
nordcloud_serverless-kms-secrets
train
js
d45c134cafe9d6e3973b9a1212635a5c18df9e2a
diff --git a/visidata/cmdlog.py b/visidata/cmdlog.py index <HASH>..<HASH> 100644 --- a/visidata/cmdlog.py +++ b/visidata/cmdlog.py @@ -190,7 +190,7 @@ class _CommandLog: comment = vd.currentReplayRow.comment if vd.currentReplayRow else cmd.helpstr vd.activeCommand = self.newRow(sheet=sheetname, - col=str(colname), + col=colname, row=str(rowname), keystrokes=keystrokes, input=args,
[cmdlog] type col indices int, and col names str since 6e<I>, the type of the *col* attribute matters. If replaying, and *col* is an `int`, the CmdLog will index by position. If *col* is a `str` it will index by column name. Closes #<I>
saulpw_visidata
train
py
6908c03762ecef5c8c8e569d044ff12732ae6ae0
diff --git a/Kwc/Shop/Cart/Detail/Trl/Component.php b/Kwc/Shop/Cart/Detail/Trl/Component.php index <HASH>..<HASH> 100644 --- a/Kwc/Shop/Cart/Detail/Trl/Component.php +++ b/Kwc/Shop/Cart/Detail/Trl/Component.php @@ -1,6 +1,20 @@ <?php class Kwc_Shop_Cart_Detail_Trl_Component extends Kwc_Abstract_Composite_Trl_Component { + public static function getSettings($masterComponentClass) + { + $ret = parent::getSettings($masterComponentClass); + $ret['flags']['processInput'] = true; + return $ret; + } + + public function preProcessInput($data) + { + if (isset($data[$this->getData()->componentId.'-delete'])) { + $this->getData()->chained->row->delete(); + } + } + public function getTemplateVars() { $ret = parent::getTemplateVars();
shop trl: fix deleting products from cart
koala-framework_koala-framework
train
php
634996a31c14cf6bf68159643cc95be33afabc01
diff --git a/src/django_ftpserver/models.py b/src/django_ftpserver/models.py index <HASH>..<HASH> 100644 --- a/src/django_ftpserver/models.py +++ b/src/django_ftpserver/models.py @@ -19,7 +19,7 @@ class FTPUserGroup(models.Model): _("Home directory"), max_length=1024, null=True, blank=True) def __str__(self): - return "{}".format(self.name) + return u"{0}".format(self.name) class Meta: verbose_name = _("FTP user group") @@ -44,7 +44,7 @@ class FTPUserAccount(models.Model): user = self.user except ObjectDoesNotExist: user = None - return "{}".format(user) + return u"{0}".format(user) def get_username(self): try:
Update models.py python <I>-<I> and django <I> same problems solved.
tokibito_django-ftpserver
train
py
e5f1006fe240c0c6491e880397556e4b67dca340
diff --git a/src/main/java/stormpot/QSlot.java b/src/main/java/stormpot/QSlot.java index <HASH>..<HASH> 100644 --- a/src/main/java/stormpot/QSlot.java +++ b/src/main/java/stormpot/QSlot.java @@ -15,7 +15,6 @@ */ package stormpot; -import java.util.Random; import java.util.concurrent.BlockingQueue; import java.util.concurrent.atomic.AtomicBoolean; @@ -60,11 +59,10 @@ class QSlot<T extends Poolable> implements Slot, SlotInfo<T> { } // XorShift PRNG with a 2^128-1 period. - private static final Random rng = new Random(); - private int x = rng.nextInt(); - private int y = rng.nextInt(); - private int z = rng.nextInt(); - private int w = 1343246171; + int x = System.identityHashCode(this); + int y = 938745813; + int z = 452465366; + int w = 1343246171; @Override public int randomInt() {
Initialise the PRNG in the same way in both BSlot and QSlot
chrisvest_stormpot
train
java
6db082a4486923637b4f427c95ab379d81b78528
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index <HASH>..<HASH> 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -372,6 +372,7 @@ def _fill_fixtures_impl(function: "Function") -> None: fi = fm.getfixtureinfo(function.parent, function.obj, None) function._fixtureinfo = fi request = function._request = FixtureRequest(function, _ispytest=True) + fm.session._setupstate.prepare(function) request._fillfixtures() # Prune out funcargs for jstests. newfuncargs = {}
fixtures: make sure to properly setup stack for _fill_fixtures_impl This code is weird, dead, deprecated and will be removed in pytest 7, but for now some tests execute it, so fix it up in preparation for some changes.
pytest-dev_pytest
train
py
bb52715ae44a5c09bb633f01ae8b8aedb88273a7
diff --git a/lib/escher/auth.rb b/lib/escher/auth.rb index <HASH>..<HASH> 100644 --- a/lib/escher/auth.rb +++ b/lib/escher/auth.rb @@ -38,6 +38,8 @@ module Escher begin authenticate(*args) return true + rescue EscherError + return false rescue return false end
SECURITY-<I>: Specification of the caught exception
emartech_escher-ruby
train
rb
4c51c3ef60fe3f946f0ed57126e0a9f5cc8f74cf
diff --git a/printer.go b/printer.go index <HASH>..<HASH> 100644 --- a/printer.go +++ b/printer.go @@ -205,6 +205,7 @@ func (p *printer) printSlice() { if p.value.Kind() == reflect.Slice { if p.visited[p.value.Pointer()] { + // Stop travarsing cyclic reference p.printf("%s{...}", p.typeString()) return }
Add a comment about cyclic reference
k0kubun_pp
train
go
ebd21de4aa9af3f929f37fcd40b29a0c23d40fde
diff --git a/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/model/Account.java b/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/model/Account.java index <HASH>..<HASH> 100644 --- a/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/model/Account.java +++ b/commerce-frontend-impl/src/main/java/com/liferay/commerce/frontend/internal/account/model/Account.java @@ -14,8 +14,6 @@ package com.liferay.commerce.frontend.internal.account.model; -import com.liferay.portal.kernel.util.HtmlUtil; - /** * @author Alessio Antonio Rendina */ @@ -42,7 +40,7 @@ public class Account { } public String getName() { - return HtmlUtil.escape(_name); + return _name; } public boolean getSuccess() {
COMMERCE-<I> Don't escape already escaped field
liferay_com-liferay-commerce
train
java
4cc88d14dcca5919488f78a8d3becc1376cc4365
diff --git a/src/de/lmu/ifi/dbs/elki/algorithm/AbstractAlgorithm.java b/src/de/lmu/ifi/dbs/elki/algorithm/AbstractAlgorithm.java index <HASH>..<HASH> 100644 --- a/src/de/lmu/ifi/dbs/elki/algorithm/AbstractAlgorithm.java +++ b/src/de/lmu/ifi/dbs/elki/algorithm/AbstractAlgorithm.java @@ -17,7 +17,8 @@ import de.lmu.ifi.dbs.elki.utilities.optionhandling.ParameterException; * <p/> * <p>This class serves also as a model of implementing an algorithm within this framework. * Any Algorithm that makes use of these flags may extend this class. Beware to make - * correct use of parameter settings via optionHandler as commented with + * correct use of parameter settings via the facilities provided within + * {@link AbstractParameterizable} as commented with * constructor and methods.</p> * * @author Arthur Zimek
replaced link to optionhandler with link to abstract parameterizable
elki-project_elki
train
java
6e114625c0ee3ef4d1c71b3e02d484d7e84c58a5
diff --git a/src/main/org/codehaus/groovy/ant/Groovyc.java b/src/main/org/codehaus/groovy/ant/Groovyc.java index <HASH>..<HASH> 100644 --- a/src/main/org/codehaus/groovy/ant/Groovyc.java +++ b/src/main/org/codehaus/groovy/ant/Groovyc.java @@ -36,6 +36,7 @@ import java.io.StringWriter; import java.nio.charset.Charset; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map;
missing import added (the conflict editor swallowed it) git-svn-id: <URL>
apache_groovy
train
java
facc07b0ea38104e11210a10501dd88e761c5384
diff --git a/core/codegen/vdm2jml/src/main/java/org/overture/codegen/vdm2jml/NamedTypeInvDepCalculator.java b/core/codegen/vdm2jml/src/main/java/org/overture/codegen/vdm2jml/NamedTypeInvDepCalculator.java index <HASH>..<HASH> 100644 --- a/core/codegen/vdm2jml/src/main/java/org/overture/codegen/vdm2jml/NamedTypeInvDepCalculator.java +++ b/core/codegen/vdm2jml/src/main/java/org/overture/codegen/vdm2jml/NamedTypeInvDepCalculator.java @@ -157,7 +157,7 @@ public class NamedTypeInvDepCalculator extends DepthFirstAnalysisAdaptor // Say we are visiting a union type that is optional, e.g. //T = [S | nat]; // Then we mark the previous type, e.g T as optional - if(previous != null) + if(optional && previous != null) { previous.makeOptional(); }
Fix for the named type invariant dependency calcutor. A union type was by accident always mark as an optional type
overturetool_overture
train
java
5906779c8d368298ae78fabe1ed09182740efbaa
diff --git a/arrayToObject.js b/arrayToObject.js index <HASH>..<HASH> 100644 --- a/arrayToObject.js +++ b/arrayToObject.js @@ -1,5 +1,5 @@ module.exports = function(arr) { var obj = {} - for (var i=0; i<arr.length; i++) { obj[arr[i]] = i } + for (var i=0; i<arr.length; i++) { obj[arr[i]] = true } return obj } \ No newline at end of file
arrayToObject needs to be truthy for all objects
marcuswestin_std.js
train
js
b27879fd72a05e8a7ed9a9c5cdcec90e0b8d1d9c
diff --git a/tests/test_dataloader.py b/tests/test_dataloader.py index <HASH>..<HASH> 100644 --- a/tests/test_dataloader.py +++ b/tests/test_dataloader.py @@ -136,6 +136,7 @@ class TestUnion(unittest.TestCase): loader.basiccast = True assert type(loader.load(1, Optional[Union[int, float]])) == int assert type(loader.load(1.0, Optional[Union[int, float]])) == float + assert loader.load(None, Optional[str]) is None class TestNamedTuple(unittest.TestCase):
Test case for the bug I want to fix
ltworf_typedload
train
py
fd1aad49a0712bbee4d91276fc78a02b9623bd7e
diff --git a/dikicli/core.py b/dikicli/core.py index <HASH>..<HASH> 100644 --- a/dikicli/core.py +++ b/dikicli/core.py @@ -351,10 +351,11 @@ def _create_html_file_content(translations): content.append("".join(mng)) content.append('<div class="examples">') for e in m.examples: - content.append( - "<p><span>{ex}</span><br><span>{tr}</span></p>" - "".format(ex=e[0], tr=e[1]) - ) + exmpl = "<p><span>{ex}</span>".format(ex=e[0]) + if e[1]: + exmpl += "<br><span>{tr}</span>".format(tr=e[1]) + exmpl += "</p>" + content.append(exmpl) content.append("</div>") # end `examples` content.append("</div>") # end `meaning` content.append("</ol>") @@ -620,6 +621,6 @@ def wrap_text(translations, linewrap=0): for e in m.examples: result.append("") result.append(wrap(e[0], findent=eindent, sindent=eindent)) - if e[1]: + if len(e) == 2: result.append(wrap(e[1], findent=eindent, sindent=eindent + 1)) return "\n".join(result)
Fix handling of examples in pol-eng translation
silenc3r_dikicli
train
py
49aa226613b57cfdab2b638155cf653eded48f35
diff --git a/plugins/kernel_v2/config/vm.rb b/plugins/kernel_v2/config/vm.rb index <HASH>..<HASH> 100644 --- a/plugins/kernel_v2/config/vm.rb +++ b/plugins/kernel_v2/config/vm.rb @@ -755,7 +755,12 @@ module VagrantPlugins @allow_fstab_modification = true if @allow_fstab_modification == UNSET_VALUE end - if !box && !clone && !machine.provider_options[:box_optional] + # HACK(phinze): We cannot honor box_optional in gogo yet so we are + # temporarily hacking in a workaround which explicitly looks for docker + # instead of the option itself. Once plugin metadata is implemented + # this conditional should be reverted to the commented line below + # if !box && !clone && !machine.provider_options[:box_optional] + if !box && !clone && machine.provider_name != :docker errors << I18n.t("vagrant.config.vm.box_missing") end
Temporary workaround to let Docker provider work Comment has the details, but this should hopefully be short lived
hashicorp_vagrant
train
rb
3bac578e7625e5d390e29ad3ad87df289c1c4d76
diff --git a/library/CM/Clockwork/Storage/FileSystem.php b/library/CM/Clockwork/Storage/FileSystem.php index <HASH>..<HASH> 100644 --- a/library/CM/Clockwork/Storage/FileSystem.php +++ b/library/CM/Clockwork/Storage/FileSystem.php @@ -8,7 +8,7 @@ class CM_Clockwork_Storage_FileSystem extends CM_Clockwork_Storage_Abstract impl $data = []; $file = $this->_getStorageFile(); if ($file->exists()) { - $values = CM_Params::jsonDecode($file->read(), true); + $values = (array) CM_Params::jsonDecode($file->read(), true); $data = \Functional\map($values, function ($timeStamp) { return new DateTime('@' . $timeStamp); });
Ensure loaded value in clockwork persistence layer is array
cargomedia_cm
train
php
0ebcd7ec5974356363fa3b0a012539b993a53d11
diff --git a/package.js b/package.js index <HASH>..<HASH> 100644 --- a/package.js +++ b/package.js @@ -34,7 +34,7 @@ pkg.devDependencies = { mightyiam: '^1.1.6', standard: '*', 'auto-package': '^1.0.0', - 'license-generator': '^2.1.0', + 'license-generator': '^0.0.13', policystat: '^1.3.0' } pkg.dependencies = {
package.js: fix license-generator version
PolicyStat_call-n-times
train
js
5f5b802c0ca2a2ba58595ac1c40e53186cf40092
diff --git a/salt/config.py b/salt/config.py index <HASH>..<HASH> 100644 --- a/salt/config.py +++ b/salt/config.py @@ -2905,7 +2905,7 @@ def apply_minion_config(overrides=None, return opts -def master_config(path, env_var='SALT_MASTER_CONFIG', defaults=None): +def master_config(path, env_var='SALT_MASTER_CONFIG', defaults=None, exit_on_config_errors=False): ''' Reads in the master configuration file and sets up default options @@ -2932,8 +2932,8 @@ def master_config(path, env_var='SALT_MASTER_CONFIG', defaults=None): defaults['default_include']) include = overrides.get('include', []) - overrides.update(include_config(default_include, path, verbose=False)) - overrides.update(include_config(include, path, verbose=True)) + overrides.update(include_config(default_include, path, verbose=False), exit_on_config_errors=exit_on_config_errors) + overrides.update(include_config(include, path, verbose=True), exit_on_config_errors=exit_on_config_errors) opts = apply_master_config(overrides, defaults) _validate_opts(opts) # If 'nodegroups:' is uncommented in the master config file, and there are
Add option to master config reader on ignoring system exit for wrong configuration
saltstack_salt
train
py
545d1e58530d355ea6680764e762f1dc2e322872
diff --git a/aeron-driver/src/main/java/io/aeron/driver/media/SendChannelEndpoint.java b/aeron-driver/src/main/java/io/aeron/driver/media/SendChannelEndpoint.java index <HASH>..<HASH> 100644 --- a/aeron-driver/src/main/java/io/aeron/driver/media/SendChannelEndpoint.java +++ b/aeron-driver/src/main/java/io/aeron/driver/media/SendChannelEndpoint.java @@ -475,12 +475,15 @@ public class SendChannelEndpoint extends UdpChannelTransport { final int length = buffer.remaining(); - if (length > DataHeaderFlyweight.HEADER_LENGTH) + if (length >= DataHeaderFlyweight.HEADER_LENGTH) { bufferForTimestamping.wrap(buffer, buffer.position(), length); - if (DataHeaderFlyweight.HDR_TYPE_DATA == - (bufferForTimestamping.getShort(DataHeaderFlyweight.TYPE_FIELD_OFFSET, LITTLE_ENDIAN) & 0xFFFF)) + final int type = + bufferForTimestamping.getShort(DataHeaderFlyweight.TYPE_FIELD_OFFSET, LITTLE_ENDIAN) & 0xFFFF; + + if (DataHeaderFlyweight.HDR_TYPE_DATA == type && + !DataHeaderFlyweight.isHeartbeat(bufferForTimestamping, length)) { final int offset = udpChannel.channelSendTimestampOffset();
[Java] Allow for timestamping data frames with zero length payload that are not heartbeats. PR #<I>.
real-logic_aeron
train
java
f82f3a354c8ecf41f5089acc35c87253a123f8ac
diff --git a/js/h5p.js b/js/h5p.js index <HASH>..<HASH> 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -1994,7 +1994,6 @@ H5P.createTitle = function (rawTitle, maxLength) { // since events may be fired on initialization. if (H5P.isFramed && H5P.externalEmbed === false) { H5P.externalDispatcher.on('*', function (event) { - console.log("external dispatcher got event, relaying it", event); window.parent.H5P.externalDispatcher.trigger.call(this, event); }); }
Removed debug HFP-<I>
h5p_h5p-php-library
train
js
84700be04a6c85b0cd4fdffba3026e63f95b00ee
diff --git a/pyqode/core/modes/filewatcher.py b/pyqode/core/modes/filewatcher.py index <HASH>..<HASH> 100644 --- a/pyqode/core/modes/filewatcher.py +++ b/pyqode/core/modes/filewatcher.py @@ -60,6 +60,7 @@ class FileWatcherMode(Mode, QtCore.QObject): self.editor.new_text_set.connect(self._update_mtime) self.editor.new_text_set.connect(self._timer.start) self.editor.text_saving.connect(self._cancel_next_change) + self.editor.text_saved.connect(self._update_mtime) self.editor.text_saved.connect(self._restart_monitoring) self.editor.focused_in.connect(self._check_for_pending) else: @@ -148,7 +149,7 @@ class FileWatcherMode(Mode, QtCore.QObject): # See OpenCobolIDE/OpenCobolIDE#97 Cache().set_cursor_position( self.editor.file.path, - TextHelper(self.editor).cursor_position()) + self.editor.textCursor().position()) self.editor.file.open(self.editor.file.path) self.file_reloaded.emit()
Fix filewatcher notification when saving big files
pyQode_pyqode.core
train
py
42fbe66029cf52f788f086e0a909e7ebbe36b262
diff --git a/EventListener/LimitEventListener.php b/EventListener/LimitEventListener.php index <HASH>..<HASH> 100644 --- a/EventListener/LimitEventListener.php +++ b/EventListener/LimitEventListener.php @@ -40,12 +40,14 @@ class LimitEventListener $table = $event->getTable(); if ($table->getRequest()->query->getInt('limit') === -1) { - $table->getQueryBuilder()->setMaxResults(-1); + $table->setLimit(-1); + $table->getQueryBuilder()->setMaxResults(null); $table->getQueryBuilder()->setFirstResult(0); return; } - $table->getQueryBuilder()->setMaxResults($table->getRequest()->query->getInt('limit', 25)); + $table->setLimit($table->getRequest()->query->getInt('limit', 25)); + $table->getQueryBuilder()->setMaxResults($table->getLimit()); $table->getQueryBuilder()->setFirstResult(($table->getCurrentPage() - 1) * $table->getLimit()); }
fix(limit): fixing a problem limiting bug
whatwedo_TableBundle
train
php
d6fdaaea6141bed931e8503ab4fd96bb3b6cd349
diff --git a/eventsourcing/domain.py b/eventsourcing/domain.py index <HASH>..<HASH> 100644 --- a/eventsourcing/domain.py +++ b/eventsourcing/domain.py @@ -402,7 +402,7 @@ def event( or isinstance(arg, type) and issubclass(arg, AggregateEvent) ): - event_spec = cast(EventSpecType, arg) + event_spec = arg def create_command_method_decorator( decorated_obj: DecoratedObjType, @@ -418,7 +418,7 @@ def event( else: if hasattr(arg, "__name__"): - item = f"'{arg.__name__}'" # type: ignore + item = f"'{arg.__name__}'" else: item = f"{arg}" raise TypeError(f"{item} is not a str, event class, function, or property")
Fixed mypy issues (redundant cast, and unused ignore).
johnbywater_eventsourcing
train
py
8255475f05e5f256cd07a7f98f73e3151b0b77cb
diff --git a/lib-dempsyimpl/src/main/java/com/nokia/dempsy/Dempsy.java b/lib-dempsyimpl/src/main/java/com/nokia/dempsy/Dempsy.java index <HASH>..<HASH> 100644 --- a/lib-dempsyimpl/src/main/java/com/nokia/dempsy/Dempsy.java +++ b/lib-dempsyimpl/src/main/java/com/nokia/dempsy/Dempsy.java @@ -308,12 +308,6 @@ public class Dempsy } private DempsyException failedStart = null; - public class ClusterStart implements Runnable - { - private Cluster cluster; - private ClusterStart(Cluster cluster) { this.cluster = cluster; } - public void run() { try { cluster.start(); } catch(DempsyException e) { failedStart = e; } } - } /** *
[cosmetic] Minor change to remove unused class.
Dempsy_dempsy
train
java
ddd84e9226ac21efdac9cbd1a9ac3b08b8440492
diff --git a/mod/assign/submission/onlinetext/locallib.php b/mod/assign/submission/onlinetext/locallib.php index <HASH>..<HASH> 100644 --- a/mod/assign/submission/onlinetext/locallib.php +++ b/mod/assign/submission/onlinetext/locallib.php @@ -137,7 +137,7 @@ class assign_submission_onlinetext extends assign_submission_plugin { $eventdata->itemid = $submission->id; $eventdata->courseid = $this->assignment->get_course()->id; $eventdata->userid = $USER->id; - $eventdata->content = trim(format_text($onlinetextsubmission->onlinetext, $onlinetextsubmission->onlineformat, array('context'=>$this->assignment->get_context()))); + $eventdata->content = trim(format_text($data->onlinetext, $data->onlinetext_editor['format'], array('context'=>$this->assignment->get_context()))); if ($files) { $eventdata->pathnamehashes = array_keys($files); }
MDL-<I>: Plagiarism API - use correct vars in event trigger
moodle_moodle
train
php
a4e3e98f084a8e9851c94674e575e6e814be00ad
diff --git a/auth/ldap/lib.php b/auth/ldap/lib.php index <HASH>..<HASH> 100644 --- a/auth/ldap/lib.php +++ b/auth/ldap/lib.php @@ -1063,7 +1063,7 @@ function auth_ldap_getdefaults(){ 'rfc2307' => 'member', 'rfc2307bis' => 'member', 'samba' => 'member', - 'ad' => 'member', //is this right? + 'ad' => 'memberOf', 'default' => 'member' ); $default['ldap_memberattribute_isdn'] = array(
Merged from MOODLE_<I>_STABLE - Updated the definition of member for AD - thanks to Inaki for the tip!
moodle_moodle
train
php
ff84316da796939a129cd19318048cf47cade470
diff --git a/spec/rubocop/cop/commissioner_spec.rb b/spec/rubocop/cop/commissioner_spec.rb index <HASH>..<HASH> 100644 --- a/spec/rubocop/cop/commissioner_spec.rb +++ b/spec/rubocop/cop/commissioner_spec.rb @@ -24,7 +24,7 @@ describe RuboCop::Cop::Commissioner do it 'returns all offenses except the ones of the cop' do cops = [] cops << double('cop A', offenses: %w(foo), excluded_file?: false) - cops << double('cop B', offenses: %w(bar), excluded_file?: true) + cops << double('cop B', excluded_file?: true) cops << double('cop C', offenses: %w(baz), excluded_file?: false) cops.each(&:as_null_object) diff --git a/spec/rubocop/formatter/worst_offenders_formatter_spec.rb b/spec/rubocop/formatter/worst_offenders_formatter_spec.rb index <HASH>..<HASH> 100644 --- a/spec/rubocop/formatter/worst_offenders_formatter_spec.rb +++ b/spec/rubocop/formatter/worst_offenders_formatter_spec.rb @@ -17,7 +17,7 @@ module RuboCop describe '#finished' do context 'when there are many offenses' do - let(:offense) { double('offense', cop_name: 'SomeCop') } + let(:offense) { double('offense') } before do formatter.started(files)
Remove unused doubled methods (#<I>) These methods can be safely removed from their test doubles without breaking the test case.
rubocop-hq_rubocop
train
rb,rb
c17bb32f70fb9f05dcfdb2c7072edc956b01b3f6
diff --git a/py/_test/pluginmanager.py b/py/_test/pluginmanager.py index <HASH>..<HASH> 100644 --- a/py/_test/pluginmanager.py +++ b/py/_test/pluginmanager.py @@ -259,6 +259,8 @@ class MultiCall: return kwargs def varnames(func): + if not inspect.isfunction(func) and not inspect.ismethod(func): + func = getattr(func, '__call__', func) ismethod = inspect.ismethod(func) rawcode = py.code.getrawcode(func) try: diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index <HASH>..<HASH> 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -340,8 +340,12 @@ def test_varnames(): class A: def f(self, y): pass + class B(object): + def __call__(self, z): + pass assert varnames(f) == ("x",) assert varnames(A().f) == ('y',) + assert varnames(B()) == ('z',) class TestMultiCall: def test_uses_copy_of_methods(self):
patch from flub to allow callable objects as hook implementations --HG-- branch : trunk
vmalloc_dessert
train
py,py
35d555d5410a27e63641f779f66abd37afe3e3f6
diff --git a/peer.go b/peer.go index <HASH>..<HASH> 100644 --- a/peer.go +++ b/peer.go @@ -674,6 +674,8 @@ func (p *peer) handleGetDataMsg(msg *btcwire.MsgGetData) { err = p.pushTxMsg(&iv.Hash, c, waitChan) case btcwire.InvTypeBlock: err = p.pushBlockMsg(&iv.Hash, c, waitChan) + case btcwire.InvTypeFilteredBlock: // unhandled + continue default: peerLog.Warnf("Unknown type in inventory request %d", iv.Type)
Do not log warning for filtered block inv types. ok @davecgh
btcsuite_btcd
train
go
70117af45724973e5a2be58e78090c9b451fbba1
diff --git a/shorty/shorty.go b/shorty/shorty.go index <HASH>..<HASH> 100644 --- a/shorty/shorty.go +++ b/shorty/shorty.go @@ -326,10 +326,15 @@ func (this *shortyImpl) FindAppOpen(app UrlScheme, sourceContext UUID) (appOpen defer c.Close() key := fmt.Sprintf("%s:*:%s:*", app, sourceContext) - reply, err := redis.Bytes(c.Do("GET", this.settings.RedisPrefix+"app-open:"+key)) - found = err == nil && reply != nil - if err == nil { - err = json.Unmarshal(reply, appOpen) + reply, err := redis.Strings(c.Do("KEYS", this.settings.RedisPrefix+"app-open:"+key)) + + found = err == nil && len(reply) > 0 + if found { + // Do a get on the first hit + value, err := redis.Bytes(c.Do("GET", reply[0])) + if err == nil { + err = json.Unmarshal(value, appOpen) + } } return }
Fix find app-open query to use redis KEYS
qorio_omni
train
go
339880caada252f59d4e6042375ce4ffcde88f60
diff --git a/store/tikv/mock-tikv/rpc.go b/store/tikv/mock-tikv/rpc.go index <HASH>..<HASH> 100644 --- a/store/tikv/mock-tikv/rpc.go +++ b/store/tikv/mock-tikv/rpc.go @@ -191,11 +191,7 @@ func (h *rpcHandler) checkRequest(ctx *kvrpcpb.Context, size int) *errorpb.Error if err := h.checkRequestContext(ctx); err != nil { return err } - - if err := h.checkRequestSize(size); err != nil { - return err - } - return nil + return h.checkRequestSize(size) } func (h *rpcHandler) checkKeyInRegion(key []byte) bool {
mock-tikv: fix golint (#<I>) golint has updated to check redundant `if`.
pingcap_tidb
train
go
25fbc1a16e15f7895ae6cab0a3109c6f0d54e569
diff --git a/instana/agent.py b/instana/agent.py index <HASH>..<HASH> 100644 --- a/instana/agent.py +++ b/instana/agent.py @@ -135,5 +135,10 @@ class Agent(object): def set_port(self, port): self.port = port - def set_from(self, from_): - self.from_ = From(**json.loads(from_)) + def set_from(self, json_string): + if type(json_string) is bytes: + raw_json = json_string.decode("UTF-8") + else: + raw_json = json_string + + self.from_ = From(**json.loads(raw_json))
Add validation & decoding for received json
instana_python-sensor
train
py
afbebd3c9a5ccf6afe0bd62b37830a06ad89684d
diff --git a/src/main/java/com/cloudant/client/api/DbDesign.java b/src/main/java/com/cloudant/client/api/DbDesign.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/cloudant/client/api/DbDesign.java +++ b/src/main/java/com/cloudant/client/api/DbDesign.java @@ -17,14 +17,11 @@ import org.lightcouch.CouchDatabase; import org.lightcouch.CouchDatabaseBase; import org.lightcouch.CouchDbClient; import org.lightcouch.CouchDbDesign; +import org.lightcouch.DesignDocument.MapReduce; //import org.lightcouch.DesignDocument; import org.lightcouch.Response; -import org.lightcouch.DesignDocument.MapReduce; -import org.lightcouch.internal.GsonHelper; import com.cloudant.client.api.model.DesignDocument; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; import com.google.gson.JsonArray; import com.google.gson.JsonObject;
DbDesign fix for single Gson object
cloudant_java-cloudant
train
java
5c91efa0911b672cf997b4fff33b18103db21e76
diff --git a/master/buildbot/test/unit/test_steps_master.py b/master/buildbot/test/unit/test_steps_master.py index <HASH>..<HASH> 100644 --- a/master/buildbot/test/unit/test_steps_master.py +++ b/master/buildbot/test/unit/test_steps_master.py @@ -13,6 +13,7 @@ # # Copyright Buildbot Team Members +import os import sys import mock from twisted.python import runtime @@ -25,9 +26,17 @@ from buildbot.steps import master class TestMasterShellCommand(steps.BuildStepMixin, unittest.TestCase): def setUp(self): + if runtime.platformType == 'win32': + self.comspec = os.environ.get('COMPSPEC') + os.environ['COMSPEC'] = r'C:\WINDOWS\system32\cmd.exe' return self.setUpBuildStep() def tearDown(self): + if runtime.platformType == 'win32': + if self.comspec: + os.environ['COMSPEC'] = self.comspec + else: + del os.environ['COMSPEC'] return self.tearDownBuildStep() def patchSpawnProcess(self, exp_cmd, exp_argv, exp_path, exp_usePTY,
Do not assume the value of COMSPEC in tests
buildbot_buildbot
train
py
75dd29b0e9205c97b0c15e775c9fbfcbb7014816
diff --git a/toytree/__init__.py b/toytree/__init__.py index <HASH>..<HASH> 100644 --- a/toytree/__init__.py +++ b/toytree/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -__version__ = "1.2.0" +__version__ = "2.0.0" __author__ = "Deren Eaton" from .Toytree import ToyTree as tree
version bump for upcoming v2
eaton-lab_toytree
train
py
f9a4f2d3e9899ca012206abba00e52f3b36ffc19
diff --git a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java b/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java index <HASH>..<HASH> 100644 --- a/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java +++ b/src/main/java/com/j256/ormlite/dao/BaseDaoImpl.java @@ -669,6 +669,7 @@ public abstract class BaseDaoImpl<T, ID> implements Dao<T, ID> { } public <FT> ForeignCollection<FT> getEmptyForeignCollection(String fieldName) throws SQLException { + checkForInitialized(); for (FieldType fieldType : tableInfo.getFieldTypes()) { if (fieldType.getDbColumnName().equals(fieldName)) { return fieldType.buildForeignCollection(null, true);
Added missing check for init.
j256_ormlite-core
train
java
3aeedcced95bbe8922a8e069e54d9c5cb95b285d
diff --git a/contrib/externs/chrome_extensions.js b/contrib/externs/chrome_extensions.js index <HASH>..<HASH> 100644 --- a/contrib/externs/chrome_extensions.js +++ b/contrib/externs/chrome_extensions.js @@ -537,6 +537,19 @@ chrome.experimental.rlz.recordProductEvent = function(product, accessPoint, chrome.experimental.rlz.clearProductState = function(product, accessPoints) {}; /** + * @param {string} product + * @param {Array.<string>} accessPoints + * @param {string} signature + * @param {string} brand + * @param {string} id + * @param {string} lang + * @param {boolean} excludeMachineId + */ +chrome.experimental.rlz.sendFinancialPing = function(product, accessPoints, + signature, brand, id, lang, + excludeMachineId) {}; + +/** * @param {string} accessPoint * @param {function(string): void} callback */
Change on <I>/<I>/<I> <I>:<I>:<I> by rogerta Adding chrome.experimental.rlz.sendFinancialPing API call to externs to match change made to chrome in <URL> Revision created by MOE tool push_codebase. MOE_MIGRATION=<I> git-svn-id: <URL>
google_closure-compiler
train
js
35649486658de33a1e24f0d66aad8072bd1af654
diff --git a/lib/utils/read-sources.js b/lib/utils/read-sources.js index <HASH>..<HASH> 100644 --- a/lib/utils/read-sources.js +++ b/lib/utils/read-sources.js @@ -29,6 +29,8 @@ var REMOTE_RESOURCE_PATTERN = /^(https?:)?\/\//; function readSources(input, context, callback) { if (typeof input == 'string') { return fromString(input, context, {}, callback); + } else if (Buffer.isBuffer(input)) { + return fromString(input.toString(), context, {}, callback); } else if (typeof input == 'object') { return fromHash(input, context, {}, callback); }
Restores accepting `Buffer` as input.
jakubpawlowicz_clean-css
train
js
a215ff9688e59d41ca898e833ede33020a5b0938
diff --git a/Slim/Http/Response.php b/Slim/Http/Response.php index <HASH>..<HASH> 100644 --- a/Slim/Http/Response.php +++ b/Slim/Http/Response.php @@ -134,7 +134,7 @@ class Response implements \ArrayAccess, \Countable, \IteratorAggregate { $this->setStatus($status); $this->headers = new \Slim\Http\Headers(array('Content-Type' => 'text/html')); - $this->headers->add($headers); + $this->headers->replace($headers); $this->cookies = new \Slim\Http\Cookies(); $this->write($body); } diff --git a/tests/Helper/SetTest.php b/tests/Helper/SetTest.php index <HASH>..<HASH> 100644 --- a/tests/Helper/SetTest.php +++ b/tests/Helper/SetTest.php @@ -61,7 +61,7 @@ class SetTest extends PHPUnit_Framework_TestCase public function testAdd() { - $this->bag->add(array( + $this->bag->replace(array( 'abc' => '123', 'foo' => 'bar' ));
Fix loose ends caused by change from Set::add to Set::replace
slimphp_Slim
train
php,php
9aa762f20ca58c6cbcfea75f1911af5760c1e2f8
diff --git a/src/Element/Identify.php b/src/Element/Identify.php index <HASH>..<HASH> 100644 --- a/src/Element/Identify.php +++ b/src/Element/Identify.php @@ -4,23 +4,33 @@ namespace Monolyth\Formulaic\Element; trait Identify { + /** + * Add a prefix to this element. + * + * @param string $prefix + */ public function prefix(string $prefix) { array_unshift($this->prefix, $prefix); } - public function name() + /** + * Returns the name of the current element. + * + * @return string + */ + public function name() : string { - return isset($this->attributes['name']) ? - $this->attributes['name'] : - null; + return $this->attributes['name']; } - public function id() + /** + * Returns the ID generated for the element. + * + * @return string + */ + public function id() : string { - if (!($name = $this->name())) { - return null; - } $id = $name; if ($this->prefix) { $id = implode('-', $this->prefix)."-$id";
docblocks and type hints
monolyth-php_formulaic
train
php
f0be329e128f2435c05e6025380733129f24a413
diff --git a/cirq/contrib/routing/device.py b/cirq/contrib/routing/device.py index <HASH>..<HASH> 100644 --- a/cirq/contrib/routing/device.py +++ b/cirq/contrib/routing/device.py @@ -59,6 +59,9 @@ def nx_qubit_layout(graph: nx.Graph) \ >>> import cirq.contrib.routing as ccr >>> import networkx as nx + >>> import matplotlib.pyplot as plt + >>> # Clear plot state to prevent issues with pyplot dimensionality. + >>> plt.clf() >>> g = ccr.xmon_device_to_graph(cirq.google.Foxtail) >>> pos = ccr.nx_qubit_layout(g) >>> nx.draw_networkx(g, pos=pos)
Doctest fix. (#<I>) Adds the fix prescribed in #<I>.
quantumlib_Cirq
train
py
bcf273160f6bcc492a5330420cda2b8f4d62594e
diff --git a/wallace/models.py b/wallace/models.py index <HASH>..<HASH> 100644 --- a/wallace/models.py +++ b/wallace/models.py @@ -83,12 +83,14 @@ class Node(Base): @property def successors2(self): outgoing_vectors = Vector.query.filter_by(origin=self).all() - return [v.destination for v in outgoing_vectors] + return [v.destination for v in outgoing_vectors + if isinstance(v.destination, Agent)] @property def predecessors2(self): incoming_vectors = Vector.query.filter_by(destination=self).all() - return [v.origin for v in incoming_vectors] + return [v.origin for v in incoming_vectors + if isinstance(v.origin, Agent)] def __repr__(self): return "Node-{}-{}".format(self.uuid[:6], self.type)
predecessors2 should return only Agents
berkeley-cocosci_Wallace
train
py
2eb95f175d14e47cc1318ece36acb2ed8b1605c1
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -21,6 +21,6 @@ setup( license="MIT License", packages=["webtul"], # packages = find_packages(), - install_requires=["python>3"], + install_requires=["python>=3"], platforms=["any"], ) diff --git a/webtul/__init__.py b/webtul/__init__.py index <HASH>..<HASH> 100644 --- a/webtul/__init__.py +++ b/webtul/__init__.py @@ -9,15 +9,15 @@ __all__ = ['struct'] __version__ = '1.01' -import aescbc -import dal -import geo -import img -import jsonx -import path -import rsa -import stringx -import struct +from . import aescbc +from . import dal +from . import geo +from . import img +from . import jsonx +from . import path +from . import rsa +from . import stringx +from . import struct if __name__ == "__main__":
Add, work with python 3.
zagfai_webtul
train
py,py
cfdc10e63c205b5807962ba52099eac90d7d264e
diff --git a/mod/forum/lib.php b/mod/forum/lib.php index <HASH>..<HASH> 100644 --- a/mod/forum/lib.php +++ b/mod/forum/lib.php @@ -1255,7 +1255,7 @@ function forum_get_discussions($forum="0", $forumsort="d.timemodified DESC", $umtable = ''; } else { $umfields = ', um.firstname AS umfirstname, um.lastname AS umlastname'; - $umtable = ' LEFT JOIN user um on (d.usermodified = um.id)'; + $umtable = ' LEFT JOIN '.$CFG->prefix.'user um on (d.usermodified = um.id)'; } return get_records_sql("SELECT $postdata, d.name, d.timemodified, d.usermodified, d.groupid,
Corrected an SQL statement that used 'user' instead of $CFG->prefix.'user'. Note - this is a left join of a table that is already inner joined in the same statement. There may be other problems here.
moodle_moodle
train
php
e3d5b196044dafbdd2d78d55dc84cce11786d86d
diff --git a/lib/muack/spy.rb b/lib/muack/spy.rb index <HASH>..<HASH> 100644 --- a/lib/muack/spy.rb +++ b/lib/muack/spy.rb @@ -5,12 +5,12 @@ module Muack class Spy < Mock def initialize stub super(stub.object) - @secret = stub.__mock_disps.values.flatten # steal disps + @stub = stub end # used for Muack::Session#verify def __mock_verify - @secret.each do |defi| + @stub.__mock_disps.values.flatten.each do |defi| __mock_dispatch(defi.msg, defi.args) if __mock_defis.key?(defi.msg) end super # simulate dispatching before passing to mock to verify diff --git a/test/test_stub.rb b/test/test_stub.rb index <HASH>..<HASH> 100644 --- a/test/test_stub.rb +++ b/test/test_stub.rb @@ -62,6 +62,14 @@ describe Muack::Stub do 2.times{ spy(Obj).say } end + should 'work with call spy and call spy' do + stub(Obj).say{} + 2.times do + Obj.say.should.eq nil + spy(Obj).say + end + end + should 'verify spy arguments' do stub(Obj).say(1){|a|a} Obj.say(1).should.eq 1
delay the time we steal the secret, so that spy and stub are synced
godfat_muack
train
rb,rb
357d393a9350f09b5d3cac2c33827efe8cf602e0
diff --git a/app/helpers/worthwhile/attribute_helper.rb b/app/helpers/worthwhile/attribute_helper.rb index <HASH>..<HASH> 100644 --- a/app/helpers/worthwhile/attribute_helper.rb +++ b/app/helpers/worthwhile/attribute_helper.rb @@ -50,7 +50,7 @@ module Worthwhile dom_label_class, link_title = "label-danger", "Private" if hash[Hydra.config.permissions.read.group].present? if hash[Hydra.config.permissions.read.group].include?('public') - if hash[Hydra.config.permissions.embargo_release_date].present? + if hash[Hydra.config.permissions.embargo.release_date].present? dom_label_class, link_title = 'label-warning', 'Open Access with Embargo' else dom_label_class, link_title = 'label-success', 'Open Access'
Use the not deprecated form of the embargo release_date from the hydra config
samvera_hyrax
train
rb
a67bcab54dd406e7c4951d9ed670eb49fcc4984d
diff --git a/client/src/app.js b/client/src/app.js index <HASH>..<HASH> 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -417,7 +417,7 @@ _kiwi.global = { } // Set any random numbers if needed - defaults.nick = defaults.nick.replace('?', Math.floor(Math.random() * 100000).toString()); + defaults.nick = defaults.nick.replace(/\?/g, Math.floor(Math.random() * 100000).toString()); if (getQueryVariable('encoding')) defaults.encoding = getQueryVariable('encoding');
Replacing multiple ? in the nick with a random number
prawnsalad_KiwiIRC
train
js
c73044a6569ab4f543d8403b9198b1dced3e1e11
diff --git a/lib/cronofy/version.rb b/lib/cronofy/version.rb index <HASH>..<HASH> 100644 --- a/lib/cronofy/version.rb +++ b/lib/cronofy/version.rb @@ -1,3 +1,3 @@ module Cronofy - VERSION = "0.5.0".freeze + VERSION = "0.5.1".freeze end
Bumped version to <I>
cronofy_cronofy-ruby
train
rb
8c23b2f4533ff91b30fbdbb4a2188852980747f0
diff --git a/netpyne/batch.py b/netpyne/batch.py index <HASH>..<HASH> 100644 --- a/netpyne/batch.py +++ b/netpyne/batch.py @@ -63,7 +63,7 @@ class Batch(object): #encoder.FLOAT_REPR = lambda o: format(o, '.12g') print('Saving batch to %s ... ' % (filename)) with open(filename, 'w') as fileObj: - json.dump(tupleToStr(dataSave), fileObj, indent=4, sort_keys=True) + json.dump(dataSave, fileObj, indent=4, sort_keys=True) def setCfgNestedParam(self, paramLabel, paramVal):
Added option to set initial cfg in batch sims - debugged
Neurosim-lab_netpyne
train
py
5279529a721ea4c44090c21f2695fdb866c89d0c
diff --git a/lib/index.js b/lib/index.js index <HASH>..<HASH> 100644 --- a/lib/index.js +++ b/lib/index.js @@ -280,7 +280,7 @@ exports.getInitWidgetsCode = function(widgetsContext) { } code += '$markoWidgets("' + ids + '");'; - return; + return code; }; @@ -324,4 +324,4 @@ exports.defineRenderer = require('./defineRenderer'); // registerWidget is a no-op on the server. // Fixes https://github.com/marko-js/marko-widgets/issues/111 -exports.registerWidget = function() {}; \ No newline at end of file +exports.registerWidget = function() {};
actually return code from getInitWidgetsCode
marko-js_marko-widgets
train
js
77a69b0b53c0ecd0c8927666798579ef6b858c70
diff --git a/src/index.js b/src/index.js index <HASH>..<HASH> 100644 --- a/src/index.js +++ b/src/index.js @@ -47,7 +47,6 @@ module.exports = function (settings = {}) { let baseConfig = [ coreConfig, settings.esnext ? esnextConfig : es5Config, - settings.esnext ? babelConfig(coreConfig) : {}, settings.esnext ? constConfig : {}, importConfig, promiseConfig, @@ -92,6 +91,10 @@ module.exports = function (settings = {}) { settings.eslint ].reduce(mergeConfigs); + if (settings.esnext) { + baseConfig = mergeConfigs(baseConfig, babelConfig(baseConfig)); + } + function isNotInExtensions (extension) { return neutrinoExtensions.indexOf(extension) < 0; }
Fix custom settings that override babel
atomspace_atomspace-eslint
train
js
79336b72be4c58c4a5a638554b4b913a9a6b632a
diff --git a/lxd/api_cluster.go b/lxd/api_cluster.go index <HASH>..<HASH> 100644 --- a/lxd/api_cluster.go +++ b/lxd/api_cluster.go @@ -274,13 +274,13 @@ func clusterPutJoin(d *Daemon, req api.ClusterPut) Response { return err } - // If node-specific configuration values are provided, it means - // the user wants to also initialize storage pools and - // networks. - if len(req.MemberConfig) > 0 { + // If the ServerAddress field is set it means that we're using + // the new join API introduced with the 'clustering_join' + // extension. + if req.ServerAddress != "" { // Connect to ourselves to initialize storage pools and // networks using the API. - d, err := lxd.ConnectLXDUnix("", nil) + d, err := lxd.ConnectLXDUnix(d.UnixSocket(), nil) if err != nil { return errors.Wrap(err, "Failed to connect to local LXD") }
Allow for MemberConfig to be empty even when using the new join API
lxc_lxd
train
go
dfed71a6ddf76afde84d3eb79e9c8cf3ab8635e3
diff --git a/command/service/update.go b/command/service/update.go index <HASH>..<HASH> 100644 --- a/command/service/update.go +++ b/command/service/update.go @@ -37,6 +37,7 @@ func newUpdateCommand(dockerCli *command.DockerCli) *cobra.Command { flags.String("image", "", "Service image tag") flags.String("args", "", "Service command args") flags.Bool("rollback", false, "Rollback to previous specification") + flags.Bool("force", false, "Force update even if no changes require it") addServiceFlags(cmd, opts) flags.Var(newListOptsVar(), flagEnvRemove, "Remove an environment variable") @@ -257,6 +258,15 @@ func updateService(flags *pflag.FlagSet, spec *swarm.ServiceSpec) error { return err } + force, err := flags.GetBool("force") + if err != nil { + return err + } + + if force { + spec.TaskTemplate.ForceUpdate++ + } + return nil }
Add force option to service update Currently, there's no way to restart the tasks of a service without making an actual change to the service. This leads to us giving awkward workarounds as in <URL>
docker_cli
train
go
13b9dd4e3043a91a4ae0b60ccffc7a45e111da52
diff --git a/_codegen/main.go b/_codegen/main.go index <HASH>..<HASH> 100644 --- a/_codegen/main.go +++ b/_codegen/main.go @@ -1,5 +1,5 @@ // This program reads all assertion functions from the assert package and -// automatically generates the corersponding requires and forwarded assertions +// automatically generates the corresponding requires and forwarded assertions package main @@ -139,7 +139,7 @@ func analyzeCode(scope *types.Scope, docs *doc.Package) (imports.Importer, []tes if !ok { continue } - // Check function signatuer has at least two arguments + // Check function signature has at least two arguments sig := fn.Type().(*types.Signature) if sig.Params().Len() < 2 { continue @@ -163,7 +163,7 @@ func analyzeCode(scope *types.Scope, docs *doc.Package) (imports.Importer, []tes return importer, funcs, nil } -// parsePackageSource returns the types scope and the package documentation from the pa +// parsePackageSource returns the types scope and the package documentation from the package func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) { pd, err := build.Import(pkg, ".", 0) if err != nil {
Fix typos in comments in _codegen/main.go
stretchr_testify
train
go
90f83a354824138bf35f644ad1d326d4249a9293
diff --git a/test/bootstrap.php b/test/bootstrap.php index <HASH>..<HASH> 100644 --- a/test/bootstrap.php +++ b/test/bootstrap.php @@ -1,7 +1,5 @@ <?php -use Typhoon\Typhoon; - require __DIR__.'/../vendor/autoload.php'; Eloquent\Asplode\Asplode::instance()->install();
Removed reference to Typhoon.
eloquent_composer-npm-bridge
train
php
0f8fd1b169ba7bf567dd7adfb2033cae4d55395a
diff --git a/ui/build/build.types.js b/ui/build/build.types.js index <HASH>..<HASH> 100644 --- a/ui/build/build.types.js +++ b/ui/build/build.types.js @@ -202,7 +202,7 @@ function writeIndexDTS (apis) { const extendsVue = (content.type === 'component' || content.type === 'mixin') const typeValue = `${extendsVue ? `VueConstructor<${typeName}>` : typeName}` // Add Type to the appropriate section of types - const propTypeDef = `${typeName}: ${typeValue}` + const propTypeDef = `${typeName}?: ${typeValue}` if (content.type === 'component') { write(components, propTypeDef) } @@ -293,7 +293,7 @@ function writeIndexDTS (apis) { quasarTypeContents.forEach(line => write(contents, line)) - writeLine(contents, `export const Quasar: PluginObject<QuasarPluginOptions>`) + writeLine(contents, `export const Quasar: PluginObject<Partial<QuasarPluginOptions>>`) writeLine(contents) writeLine(contents, `import './vue'`)
Change Quasar Plugin options to support only passing some options. (#<I>)
quasarframework_quasar
train
js
49cbd27441a9c736f0bd8478025ed81c47c55cfa
diff --git a/packages/babylon/src/parser/util.js b/packages/babylon/src/parser/util.js index <HASH>..<HASH> 100644 --- a/packages/babylon/src/parser/util.js +++ b/packages/babylon/src/parser/util.js @@ -69,7 +69,7 @@ pp.isLineTerminator = function () { // pretend that there is a semicolon at this position. pp.semicolon = function () { - if (!this.eat(tt.semi) && !this.canInsertSemicolon()) this.unexpected(); + if (!this.isLineTerminator()) this.unexpected(); }; // Expect a token of a given type. If found, consume it, otherwise,
simplify Parser::semicolon method
babel_babel
train
js
a2f1409394bba748ccc8c7a487f9826b17dfd032
diff --git a/jupytext/formats.py b/jupytext/formats.py index <HASH>..<HASH> 100644 --- a/jupytext/formats.py +++ b/jupytext/formats.py @@ -83,7 +83,7 @@ JUPYTEXT_FORMATS = ( # Version 1.1 on 2019-03-24 - jupytext v1.1.0 : Markdown regions and cell metadata # Version 1.2 on 2019-09-21 - jupytext v1.3.0 : Raw regions are now encoded with HTML comments (#321) # and by default, cell metadata use the key=value representation (#347) - # Version 1.3 on 2021-01-24 - jupytext v1.9.2 : Code cells may start with more than three backticks (#712) + # Version 1.3 on 2021-01-24 - jupytext v1.10.0 : Code cells may start with more than three backticks (#712) current_version_number="1.3", min_readable_version_number="1.0", ),
The next release will be Jupytext <I>
mwouts_jupytext
train
py
2a17b9ea27fade26ba8c7b144c2bbe961a06598a
diff --git a/remi/server.py b/remi/server.py index <HASH>..<HASH> 100644 --- a/remi/server.py +++ b/remi/server.py @@ -561,10 +561,10 @@ ws.onerror = function(evt){ self.send_response(404) return - for k,v in headers.iteritems(): - self.send_header(k, v) + for k in headers.keys(): + self.send_header(k, headers[k]) self.end_headers() - self.wfile.write(encodeIfPyGT3(content)) + self.wfile.write(content) class ThreadedHTTPServer(socketserver.ThreadingMixIn, HTTPServer):
Fixed compatibility issues with python3.x.
dddomodossola_remi
train
py
9ddaf2a2aa6ea9fef8f65d5e79d9e2e3ede751cd
diff --git a/lib/doorkeeper/models/concerns/scopes.rb b/lib/doorkeeper/models/concerns/scopes.rb index <HASH>..<HASH> 100644 --- a/lib/doorkeeper/models/concerns/scopes.rb +++ b/lib/doorkeeper/models/concerns/scopes.rb @@ -4,7 +4,7 @@ module Doorkeeper module Models module Scopes def scopes - OAuth::Scopes.from_string(self[:scopes]) + OAuth::Scopes.from_string(scopes_string) end def scopes_string
Use scopes_string internally This allows you to override `scopes_string` if you want to set default scopes for a particular type of model (eg. for a `Doorkeeper::Application`). Without this patch you'd need to override `scopes_string` and `scopes`.
doorkeeper-gem_doorkeeper
train
rb
f1c89a8d96456996d699c50a2eeb7aca96e30205
diff --git a/tests/unit/py2/nupic/math/sparse_matrix_test.py b/tests/unit/py2/nupic/math/sparse_matrix_test.py index <HASH>..<HASH> 100755 --- a/tests/unit/py2/nupic/math/sparse_matrix_test.py +++ b/tests/unit/py2/nupic/math/sparse_matrix_test.py @@ -2482,7 +2482,7 @@ class SparseMatrixTest(unittest.TestCase): error('matrix_entropy, cols, with smoothing != 1') - #--------------------------------------------------------------------------------- + @unittest.skip("Doesn't play nicely with py.test.") def test_LogSumApprox(self): print 'Testing LogSumApprox'
Skip the failing test method that doesn't seem to work with py.test.
numenta_nupic.core
train
py
0594d7d5ff69c3d688a6561ac7e2d7cf79005abc
diff --git a/build.js b/build.js index <HASH>..<HASH> 100644 --- a/build.js +++ b/build.js @@ -1,3 +1,4 @@ +"use strict"; var stealTools = require("steal-tools"); stealTools.export({ diff --git a/can-stache-ast.js b/can-stache-ast.js index <HASH>..<HASH> 100644 --- a/can-stache-ast.js +++ b/can-stache-ast.js @@ -1,3 +1,4 @@ +"use strict"; var controls = require("./controls"); var parser = require('can-view-parser'); diff --git a/controls.js b/controls.js index <HASH>..<HASH> 100644 --- a/controls.js +++ b/controls.js @@ -1,3 +1,4 @@ +"use strict"; var mustacheLineBreakRegExp = /(?:(^|\r?\n)(\s*)(\{\{([\s\S]*)\}\}\}?)([^\S\n\r]*)($|\r?\n))|(\{\{([\s\S]*)\}\}\}?)/g, mustacheWhitespaceRegExp = /(\s*)(\{\{\{?)(-?)([\s\S]*?)(-?)(\}\}\}?)(\s*)/g;
Adds use strict. Fixes canjs/canjs#<I>
canjs_can-stache-ast
train
js,js,js
eac5cb22c92d837a2406c289492b894d6fbcb775
diff --git a/leancloud/push.py b/leancloud/push.py index <HASH>..<HASH> 100644 --- a/leancloud/push.py +++ b/leancloud/push.py @@ -8,6 +8,7 @@ import arrow import dateutil.tz as tz from leancloud.object_ import Object +from leancloud.errors import LeanCloudError from leancloud import client @@ -27,6 +28,9 @@ class Notification(Object): self._update_data(response.json()) + def save(self): + raise LeanCloudError(code=1, error='Notification does not support modify') + def send(data, channels=None, push_time=None, expiration_time=None, expiration_interval=None, where=None, cql=None): """ 发送推送消息。返回结果为此条推送对应的 _Notification 表中的对象,但是如果需要使用其中的数据,需要调用 fetch() 方法将数据同步至本地。 diff --git a/tests/test_push.py b/tests/test_push.py index <HASH>..<HASH> 100644 --- a/tests/test_push.py +++ b/tests/test_push.py @@ -44,3 +44,10 @@ def test_basic_push(): # type: () -> None notification = push.send(data, where=query, push_time=datetime.now()) notification.fetch() assert(notification.id) + + try: + notification.save() + except leancloud.LeanCloudError as e: + assert e.code == 1 + else: + raise Exception()
fix: disable leancloud.Notification#save (#<I>)
leancloud_python-sdk
train
py,py
67aa3dc1534540ecc39de9987cd0e6bd4b77d68c
diff --git a/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java b/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java index <HASH>..<HASH> 100644 --- a/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java +++ b/extensions/hdfs-storage/src/main/java/io/druid/storage/hdfs/HdfsDataSegmentPusher.java @@ -64,7 +64,7 @@ public class HdfsDataSegmentPusher implements DataSegmentPusher @Override public String getPathForHadoop(String dataSource) { - return new Path(config.getStorageDirectory(), dataSource).toUri().toString(); + return new Path(config.getStorageDirectory()).toUri().toString(); } @Override
on HDFS store segments in "dataSource/interval/.." and not in "dataSource/dataSource/interval.."
apache_incubator-druid
train
java
d51253d4f4d8276ec720ef2d5f46f1aa19b8b8d4
diff --git a/lib/squirm/core.rb b/lib/squirm/core.rb index <HASH>..<HASH> 100644 --- a/lib/squirm/core.rb +++ b/lib/squirm/core.rb @@ -74,7 +74,7 @@ module Squirm # connection is given, then one will be checked out from the pool for use # inside the block, and then checked back in when the method returns. def use(conn = nil) - conn_given = conn != nil + conn_given = !!conn conn = conn_given ? conn : @pool.checkout begin yield Thread.current[:squirm_connection] = conn diff --git a/spec/core_spec.rb b/spec/core_spec.rb index <HASH>..<HASH> 100644 --- a/spec/core_spec.rb +++ b/spec/core_spec.rb @@ -53,6 +53,13 @@ describe Squirm do end assert_nil Thread.current[:squirm_connection] end + + it "should use connection if given as an argument" do + mock = Object.new + Squirm.use(mock) do |conn| + assert mock == conn + end + end end describe "#exec" do
Add test for passing connection to `use`.
norman_squirm
train
rb,rb
c35631b524a05d87702c1363bfbf5344550389c0
diff --git a/tests/Cookie/CookieTest.php b/tests/Cookie/CookieTest.php index <HASH>..<HASH> 100755 --- a/tests/Cookie/CookieTest.php +++ b/tests/Cookie/CookieTest.php @@ -118,6 +118,22 @@ class CookieTest extends TestCase $this->assertFalse($cookieJar->hasQueued('foo', '/wrongPath')); } + public function testQueueForget() + { + $cookieJar = $this->getCreator(); + $this->assertCount(0, $cookieJar->getQueuedCookies()); + + $cookieJar->queueForget('foobar', '/path', '/domain'); + + $cookie = $cookieJar->queued('foobar'); + $this->assertEquals('foobar', $cookie->getName()); + $this->assertEquals(null, $cookie->getValue()); + $this->assertEquals('/path', $cookie->getPath()); + $this->assertEquals('/domain', $cookie->getDomain()); + $this->assertTrue($cookie->getExpiresTime() < time()); + $this->assertCount(1, $cookieJar->getQueuedCookies()); + } + public function testUnqueue() { $cookie = $this->getCreator();
Add tests for `queueForget()` method
laravel_framework
train
php
11cb69d2ce62f5fc85e40fc60d32e8eaf6888cb7
diff --git a/public_header.go b/public_header.go index <HASH>..<HASH> 100644 --- a/public_header.go +++ b/public_header.go @@ -162,13 +162,10 @@ func ParsePublicHeader(b *bytes.Reader, packetSentBy protocol.Perspective) (*Pub // see https://github.com/lucas-clemente/quic-go/issues/232 if !header.VersionFlag && !header.ResetFlag { header.DiversificationNonce = make([]byte, 32) - for i := 0; i < 32; i++ { - var val byte - val, err = b.ReadByte() - if err != nil { - return nil, err - } - header.DiversificationNonce[i] = val + // this Read can never return an EOF for a valid packet, since the diversification nonce is followed by the packet number + _, err = b.Read(header.DiversificationNonce) + if err != nil { + return nil, err } } }
optimize reading of diversification nonces from the PublicHeader
lucas-clemente_quic-go
train
go
3fce1f15ce9a8197ca29885fd6c443844b24133c
diff --git a/src/Thujohn/Twitter/Twitter.php b/src/Thujohn/Twitter/Twitter.php index <HASH>..<HASH> 100644 --- a/src/Thujohn/Twitter/Twitter.php +++ b/src/Thujohn/Twitter/Twitter.php @@ -430,6 +430,11 @@ class Twitter extends tmhOAuth { return 'https://twitter.com/intent/favorite?tweet_id=' . $tweet->id_str; } + public function linkReply($tweet) + { + return 'https://twitter.com/intent/tweet?in_reply_to=' . $tweet->id_str; + } + private function jsonDecode($json, $assoc = false) { if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4))
Add linkReply method to get reply url.
thujohn_twitter
train
php
3d1534fbc882f161e6cc34adaa21daaaad77a0ff
diff --git a/test/base/options.js b/test/base/options.js index <HASH>..<HASH> 100644 --- a/test/base/options.js +++ b/test/base/options.js @@ -108,4 +108,10 @@ describe ('neural network constructor values', () => { var net = new brain.NeuralNetwork(opts); assert.equal(opts.activation, net.activation, `activation => ${net.activation} but should be ${opts.activation}`); }) + + it('leakyReluAlpha should be settable in the constructor', () => { + let opts = { leakyReluAlpha: 0.1337 }; + var net = new brain.NeuralNetwork(opts); + assert.equal(opts.leakyReluAlpha, net.leakyReluAlpha, `leakyReluAlpha => ${net.leakyReluAlpha} but should be ${opts.leakyReluAlpha}`); + }) }); \ No newline at end of file
Added basic test for leakyReluAlpha option
BrainJS_brain.js
train
js
8fc17bba7d60eabba254101183b7a6b8531af0e0
diff --git a/src/Dots.js b/src/Dots.js index <HASH>..<HASH> 100644 --- a/src/Dots.js +++ b/src/Dots.js @@ -3,10 +3,10 @@ import { Paper } from 'material-ui' const styles = { dot: { - width: 10, - height: 10, + width: 8, + height: 8, background: '#fff', - margin: '0 3px', + margin: '0 4px', float: 'left', transition: 'all 400ms cubic-bezier(0.4, 0.0, 0.2, 1)' }
Adjust size and spacing of the dots according to specs.
TeamWertarbyte_material-auto-rotating-carousel
train
js
87f5b7749f004590f27f41d16f5e7872ab5b4abc
diff --git a/modules/ircbee/ircbee.go b/modules/ircbee/ircbee.go index <HASH>..<HASH> 100644 --- a/modules/ircbee/ircbee.go +++ b/modules/ircbee/ircbee.go @@ -115,10 +115,10 @@ func (sys *IrcBee) Action(action modules.Action) bool { case "send": for _, opt := range action.Options { if opt.Name == "channel" { - tos = append(tos, opt.Value) + tos = append(tos, opt.Value.(string)) } if opt.Name == "text" { - text = opt.Value + text = opt.Value.(string) } } default: diff --git a/modules/modules.go b/modules/modules.go index <HASH>..<HASH> 100644 --- a/modules/modules.go +++ b/modules/modules.go @@ -38,7 +38,7 @@ type Placeholder struct { Name string Description string Type string - Value string + Value interface{} } var (
* Placeholder's value needs be an interface{}, so we can stuff arbitrary content in it.
muesli_beehive
train
go,go
9e1c729eb679324f73eb22c21fce536f9f073f82
diff --git a/js/cloudmine.js b/js/cloudmine.js index <HASH>..<HASH> 100644 --- a/js/cloudmine.js +++ b/js/cloudmine.js @@ -60,7 +60,7 @@ */ var apply_params = function(url, opts){ var params = {}; - var valid_params = ["f", "count", "skip", "limit"]; + var valid_params = ["f", "count", "skip", "limit", "params"]; var param; for(var index in valid_params){ if(valid_params.hasOwnProperty(index)){
added "params" to valid params list
cloudmine_CloudMineSDK-JavaScript
train
js
827a7da13d40b80f1f1f4145643f4a25bca45055
diff --git a/src/main/java/org/telegram/botapi/api/TelegramBot.java b/src/main/java/org/telegram/botapi/api/TelegramBot.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/telegram/botapi/api/TelegramBot.java +++ b/src/main/java/org/telegram/botapi/api/TelegramBot.java @@ -361,12 +361,9 @@ public final class TelegramBot { return messageResponse != null ? messageResponse : MessageImpl.createMessage(jsonResponse != null ? jsonResponse.getObject() : null); } - public void setUpdateMethod(UpdateManager.UpdateMethod updateMethod) { + public void startUpdates() { - if(updateMethod.equals(UpdateManager.UpdateMethod.REQUEST_UPDATES)) { - - updateManager = new RequestUpdatesManager(this); - } + updateManager = new RequestUpdatesManager(this); } public ListenerRegistry getEventsManager() {
Change the setUpdateMethod method to startUpdates without any arguments.
zackpollard_JavaTelegramBot-API
train
java
428b5d16c5fc22915ee34487a766c0a0267350ce
diff --git a/src/frontend/org/voltcore/logging/VoltLogger.java b/src/frontend/org/voltcore/logging/VoltLogger.java index <HASH>..<HASH> 100644 --- a/src/frontend/org/voltcore/logging/VoltLogger.java +++ b/src/frontend/org/voltcore/logging/VoltLogger.java @@ -126,6 +126,7 @@ public class VoltLogger { } catch (Exception e) { Throwables.propagate(e); } + break; default: throw new AssertionError("Unrecognized level " + level); }
For ENG-<I>, bring back missing break
VoltDB_voltdb
train
java
80ff05c8e0c9edd898c624ef22af97270a9d2e55
diff --git a/NavigationReactMobile/sample/twitter/createStateNavigator.js b/NavigationReactMobile/sample/twitter/createStateNavigator.js index <HASH>..<HASH> 100644 --- a/NavigationReactMobile/sample/twitter/createStateNavigator.js +++ b/NavigationReactMobile/sample/twitter/createStateNavigator.js @@ -15,9 +15,10 @@ export default () => { {key: 'photo', trackCrumbTrail: true} ], new MobileHistoryManager(url => { var {state, data} = stateNavigator.parseLink(url); - return stateNavigator.fluent() - .navigate('home') - .navigate(state.key, data).url; + var fluent = stateNavigator.fluent().navigate('home'); + if (state.key === 'photo') + fluent = fluent.navigate('tweet', {id: data.id}) + return fluent.navigate(state.key, data).url; })); const {home, tweet, timeline, photo} = stateNavigator.states;
Navigated home -> tweet -> photo on start If photo bookmarked then X should go back to tweet that owns the photo and then to home
grahammendick_navigation
train
js
a6caf9dbe579fbf8acdbcbea5782e0f76154749a
diff --git a/nosedjango/nosedjango.py b/nosedjango/nosedjango.py index <HASH>..<HASH> 100644 --- a/nosedjango/nosedjango.py +++ b/nosedjango/nosedjango.py @@ -14,7 +14,9 @@ import nose.case # search the current working directory and all parent directories to find # the settings file from nose.importer import add_path -os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' +if not 'DJANGO_SETTINGS_MODULE' in os.environ: + os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' + import re NT_ROOT = re.compile(r"^[a-zA-Z]:\\$") def get_SETTINGS_PATH(): @@ -22,8 +24,11 @@ def get_SETTINGS_PATH(): Hunt down the settings.py module by going up the FS path ''' cwd = os.getcwd() + settings_filename = '%s.py' % ( + os.environ['DJANGO_SETTINGS_MODULE'].split('.')[-1] + ) while cwd: - if 'settings.py' in os.listdir(cwd): + if settings_filename in os.listdir(cwd): break cwd = os.path.split(cwd)[0] if os.name == 'nt' and NT_ROOT.match(cwd):
Support custom named setttings.py files
nosedjango_nosedjango
train
py
0f999d014b635b5f4624750e08f28f2662e825a6
diff --git a/src/brackets.js b/src/brackets.js index <HASH>..<HASH> 100644 --- a/src/brackets.js +++ b/src/brackets.js @@ -14,10 +14,15 @@ $(document).ready(function() { value: 'var myResponse="Yes, it will be!"\n' }); + // Load a default project into the tree if (brackets.inBrowser) { + // In browser: dummy folder tree (hardcoded in ProjectManager) ProjectManager.loadProject("DummyProject"); } else { - // TODO: what is default project when in app shell ?? + // In app shell: load Brackets itself + var loadedPath = window.location.pathname; + var bracketsSrc = loadedPath.substr(0, loadedPath.lastIndexOf("/")); + ProjectManager.loadProject(bracketsSrc); } $("#btn-open-project").click(function() {
Set up Brackets so it loads its own src code by default (if outside of appshell, it still uses hardcoded dummy data instead).
adobe_brackets
train
js
51bff631240076ccbf348d069c009f40dfb78f97
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ class DiscoverTest(Command): setup( name='isc_dhcp_leases', - version='0.4.0', + version='0.4.1', packages=['isc_dhcp_leases'], url='https://github.com/MartijnBraam/python-isc-dhcp-leases', license='MIT',
Released <I> with IPv6 bugfixes
MartijnBraam_python-isc-dhcp-leases
train
py
f168df6b171ea8f6d4e106ab912aa2b5390cd2f8
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -1,18 +1,24 @@ from setuptools import setup +try: + import pypandoc + long_description = pypandoc.convert('README.md', 'rst', 'markdown') +except (ImportError, FileNotFoundError, RuntimeError): + #ImportError: pypandoc failed to import + #FileNotFoundError: couldn't launch pandoc + #RuntimeError: failed to convert + long_description = open('README.md').read() + setup( name="Dispatching", version="1.0.1", py_modules=['dispatching',], test_suite='test', platforms='any', - package_data={ - '': ['README.md', 'LICENSE',], - }, author="Nathan West", description="A library for overloading python functions", - long_description=open('README.md').read(), + long_description=long_description, license="LGPLv3", url="https://github.com/Lucretiel/Dispatch",
setup.py now uses pypandoc * setup.py now attempts to use pypandoc to convert README.md to rst for pypi
Lucretiel_Dispatch
train
py
ba8795d70f59b666048685ba2e0642b7dbe55ec1
diff --git a/thehive4py/helpers.py b/thehive4py/helpers.py index <HASH>..<HASH> 100644 --- a/thehive4py/helpers.py +++ b/thehive4py/helpers.py @@ -1,4 +1,10 @@ import datetime as dt +import time + + +def now_to_ts() -> int: + """Return now as TheHive timestamp.""" + return int(time.time() * 1000) def dt_to_ts(datetime: dt.datetime) -> int:
Add now to timestamp helper
TheHive-Project_TheHive4py
train
py
98ba7f9a48cf5e8979c6c6ec0569dedd57126622
diff --git a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java index <HASH>..<HASH> 100755 --- a/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java +++ b/cpo-jdbc/src/test/java/org/synchronoss/cpo/jdbc/EntityTest.java @@ -37,7 +37,7 @@ import org.synchronoss.cpo.meta.domain.CpoAttribute; */ public class EntityTest extends TestCase { - private static Logger logger = LoggerFactory.getLogger(BlobTest.class.getName()); + private static Logger logger = LoggerFactory.getLogger(EntityTest.class.getName()); public EntityTest(String name) { super(name);
Fixed the logger static to be correct
synchronoss_cpo-api
train
java
1f6a7eb8108abbbcd615e059a7faeb95b5bb001d
diff --git a/torrent.go b/torrent.go index <HASH>..<HASH> 100644 --- a/torrent.go +++ b/torrent.go @@ -204,7 +204,7 @@ func (t *Torrent) addrActive(addr string) bool { return false } -func (t *Torrent) worstUnclosedConns() (ret []*connection) { +func (t *Torrent) unclosedConnsAsSlice() (ret []*connection) { ret = make([]*connection, 0, len(t.conns)) for c := range t.conns { if !c.closed.IsSet() { @@ -758,7 +758,8 @@ func (t *Torrent) wantPieceIndex(index int) bool { // pieces, or has been in worser half of the established connections for more // than a minute. func (t *Torrent) worstBadConn() *connection { - wcs := worseConnSlice{t.worstUnclosedConns()} + wcs := worseConnSlice{t.unclosedConnsAsSlice()} + heap.Init(&wcs) for wcs.Len() != 0 { c := heap.Pop(&wcs).(*connection) if c.UnwantedChunksReceived >= 6 && c.UnwantedChunksReceived > c.UsefulChunksReceived {
It looks like Torrent.worstBadConn was returning an arbitrary bad connection, it wasn't the worst heap.Init got lost somewhere along the way? Need a unit test for this.
anacrolix_torrent
train
go
f2e86bf7462d367bfc4c4478201629fdf28ff120
diff --git a/src/Engine/Elasticsearch/ElasticsearchClient.php b/src/Engine/Elasticsearch/ElasticsearchClient.php index <HASH>..<HASH> 100644 --- a/src/Engine/Elasticsearch/ElasticsearchClient.php +++ b/src/Engine/Elasticsearch/ElasticsearchClient.php @@ -45,6 +45,8 @@ class ElasticsearchClient $this->method = self::METHOD_GET; $this->executeCurlRequest(); + + return $this; } public function setIndex($value) @@ -71,6 +73,16 @@ class ElasticsearchClient return $this; } + public function getResponse() + { + return $this->getDecodedResponse()['hits']; + } + + public function getTotalItemsCount() + { + return $this->getResponse()['total']; + } + private function executeCurlRequest() { $handle = curl_init((string) $this->url); @@ -90,4 +102,9 @@ class ElasticsearchClient return $this; } + + private function getDecodedResponse() + { + return json_decode($this->response, true); + } }
<I> - Added method which decodes json response from elasticsearch.
g4code_data-mapper
train
php
70b48c44d734e0f06ca69577b940f781e691c98b
diff --git a/scripts/install.js b/scripts/install.js index <HASH>..<HASH> 100644 --- a/scripts/install.js +++ b/scripts/install.js @@ -53,4 +53,4 @@ var uglifyConfigFile = fs.readFileSync(path.join(__dirname, '../uglify-config.js fs.writeFileSync(path.join(paths[0], 'uglify-config.json'), uglifyConfigFile); console.log('Updating hooks directory to have execution permissions...'); -shell.chmod('-R', 755, paths[0]); +shell.chmod('-R', 'a+x', path.join(paths[1], 'uglify.js'));
execution permissions: only chmod +x uglify.js When installing this package, it shouldn't change the execution permission of all the files in hooks/ but rather only uglify.js.
rossmartin_cordova-uglify
train
js
963812ae62579f6040b805218d9e798e1e66b324
diff --git a/lib/go/thrift/simple_server.go b/lib/go/thrift/simple_server.go index <HASH>..<HASH> 100644 --- a/lib/go/thrift/simple_server.go +++ b/lib/go/thrift/simple_server.go @@ -221,7 +221,9 @@ func treatEOFErrorsAsNil(err error) error { if err == nil { return nil } - if err == io.EOF { + // err could be io.EOF wrapped with TProtocolException, + // so that err == io.EOF doesn't necessarily work in some cases. + if err.Error() == io.EOF.Error() { return nil } if err, ok := err.(TTransportException); ok && err.TypeId() == END_OF_FILE {
THRIFT-<I>: Handle wrapped io.EOF errors TCompactProtocol (which is used by THeaderTransport to read headers) could wrap the underlying error with TProtocolException, which breaks err == io.EOF test in some cases. Client: go This closes #<I>.
apache_thrift
train
go
24bbe07822ac5b256ab1cbea9266ae332820e643
diff --git a/custom-rating-grifus.php b/custom-rating-grifus.php index <HASH>..<HASH> 100644 --- a/custom-rating-grifus.php +++ b/custom-rating-grifus.php @@ -13,7 +13,7 @@ return [ 'id' => 'CustomRatingGrifus', 'name' => 'Custom Rating', - 'version' => '1.0.0', + 'version' => '1.0.1', 'description' => __('Replaces IMDB rating by your own rating system.', 'extensions-for-grifus'), 'state' => 'uninstalled', 'category' => 'wp-plugin-extension',
Updated to <I> version
eliasis-framework_custom-rating-grifus
train
php
6e8f1b89f3fd4140958b2c333d0798b9d65b5c12
diff --git a/src/Cli.php b/src/Cli.php index <HASH>..<HASH> 100644 --- a/src/Cli.php +++ b/src/Cli.php @@ -13,7 +13,8 @@ use Joomla\Filter; /** * Joomla! Input CLI Class * - * @since 1.0 + * @since 1.0 + * @deprecated 2.0 Use a Symfony\Component\Console\Input\InputInterface implementation when using the `joomla/console` package */ class Cli extends Input {
Deprecate CLI subclass support in favor of symfony/console API
joomla-framework_input
train
php
2e1eff51225bfda9cf6397d967dfa606bcdf3293
diff --git a/src/processor.js b/src/processor.js index <HASH>..<HASH> 100644 --- a/src/processor.js +++ b/src/processor.js @@ -440,6 +440,7 @@ function processRoom(roomId, {intents, roomObjects, users, roomTerrain, gameTime //userVisibility[object.user] = true; if(object.type != 'constructionSite' && !object.newbieWall && + object.type != 'ruin' && object.type != 'tombstone' && (object.type != 'rampart' || !object.isPublic)) { mapView[object.user] = mapView[object.user] || []; mapView[object.user].push([object.x, object.y]);
refact(processor): exclude ruins and tombstones from map view
screeps_engine
train
js
ae51daf8932e90c66af98e26908cf337f415aacd
diff --git a/tests/hooks/test_hive_hook.py b/tests/hooks/test_hive_hook.py index <HASH>..<HASH> 100644 --- a/tests/hooks/test_hive_hook.py +++ b/tests/hooks/test_hive_hook.py @@ -208,7 +208,7 @@ class TestHiveMetastoreHook(HiveEnvironmentTest): pattern=self.table + "*") self.assertIn(self.table, {table.tableName for table in tables}) - def get_databases(self): + def test_get_databases(self): databases = self.hook.get_databases(pattern='*') self.assertIn(self.database, databases)
[AIRFLOW-<I>] Fix TestHiveMetastoreHook to run all cases TestHiveMetastoreHook has a method which name doesn't start with test_. This PR renames it to be executed. Closes #<I> from sekikn/AIRFLOW-<I>
apache_airflow
train
py
0647b39a7b829cf40c21140c4dfd891c3b70db7c
diff --git a/tests/unit/DynamicActiveQueryTest.php b/tests/unit/DynamicActiveQueryTest.php index <HASH>..<HASH> 100644 --- a/tests/unit/DynamicActiveQueryTest.php +++ b/tests/unit/DynamicActiveQueryTest.php @@ -83,6 +83,24 @@ class DynamicActiveQueryTest extends DatabaseTestCase } } + public function testNestedTypesProcessing() + { + // it's enough to just check select - logic is similar for the whole sql query + $query = new DynamicActiveQuery(Product::className()); + + foreach ($this->types() as $k => $possibleTypes) { + foreach ($possibleTypes as $type) { + $query->select(["{test.child|$type}"]); + $command = $query->createCommand(); + + $sql = $command->getRawSql(); + $this->assertNotContains("{test|$type}", $sql, + "Type $type should be processed, there shouldn't be any user's dynamic queries"); + $this->assertContains("as $type", $sql, "Type $type should be processed", true); + } + } + } + private function types() { return [
added test for nested attr recognizing
tom--_yii2-dynamic-ar
train
php
c613fa1a4477bd89663cafbc04b5de2d8e0bcde3
diff --git a/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java b/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java index <HASH>..<HASH> 100644 --- a/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java +++ b/algoliasearch/src/offline/java/com/algolia/search/saas/OfflineIndex.java @@ -599,7 +599,7 @@ public class OfflineIndex { * @param completionHandler Completion handler to be notified of the transaction's outcome. * @return A cancellable operation (see warning for important caveat). */ - public Request rollbackTransactionAsync(@NonNull CompletionHandler completionHandler) { + public Request rollbackTransactionAsync(CompletionHandler completionHandler) { assertTransaction(); return getClient().new AsyncTaskRequest(completionHandler, getClient().transactionExecutorService) { @NonNull
[offline] Make completion handler mandatory on transaction rollback
algolia_algoliasearch-client-android
train
java
298d1817f7d58407fffd6b45195297707fda68fe
diff --git a/lib/hammer_cli_katello/content_view_version.rb b/lib/hammer_cli_katello/content_view_version.rb index <HASH>..<HASH> 100644 --- a/lib/hammer_cli_katello/content_view_version.rb +++ b/lib/hammer_cli_katello/content_view_version.rb @@ -18,7 +18,9 @@ module HammerCLIKatello version end - build_options + build_options do |o| + o.expand(:all).including(:organizations) + end end class InfoCommand < HammerCLIKatello::InfoCommand @@ -55,7 +57,7 @@ module HammerCLIKatello end build_options do |o| - o.expand(:all).including(:environments, :content_views) + o.expand(:all).including(:environments, :content_views, :organizations) end end @@ -110,7 +112,7 @@ module HammerCLIKatello failure_message _("Could not delete the content view") build_options do |o| - o.expand(:all).including(:environments, :content_views) + o.expand(:all).including(:environments, :content_views, :organizations) end end
refs #<I> - add org back to content-view version commands, bz <I>
Katello_hammer-cli-katello
train
rb
8e2af14cd6b6097d79c0bb1c4277692d278cbb1a
diff --git a/src/Chronos/Scaffolding/config/defaults.php b/src/Chronos/Scaffolding/config/defaults.php index <HASH>..<HASH> 100644 --- a/src/Chronos/Scaffolding/config/defaults.php +++ b/src/Chronos/Scaffolding/config/defaults.php @@ -2,7 +2,7 @@ return [ - 'version' => '2.2.18', + 'version' => '2.2.19', 'alerts' => [
Fixed issue with laravel/passport versioning
c4studio_chronos
train
php
86eb964580c41456e9b30976eddd21ae14cd52dd
diff --git a/pyathena/result_set.py b/pyathena/result_set.py index <HASH>..<HASH> 100644 --- a/pyathena/result_set.py +++ b/pyathena/result_set.py @@ -309,6 +309,7 @@ class AthenaPandasResultSet(AthenaResultSet): ) if ( self.state == AthenaQueryExecution.STATE_SUCCEEDED + and self.output_location and self.output_location.endswith((".csv", ".txt")) ): self._df = self._as_pandas()
Fix Item "None" of "Optional[str]" has no attribute "endswith"
laughingman7743_PyAthena
train
py
c7e1340fedbf7a8d6bc91d61a499aeb8d4cb8520
diff --git a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java index <HASH>..<HASH> 100644 --- a/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java +++ b/blueocean-rest-impl/src/main/java/io/jenkins/blueocean/service/embedded/TryBlueOceanMenu.java @@ -50,8 +50,10 @@ public class TryBlueOceanMenu extends TransientActionFactory<ModelObject> { } try { ((Actionable) target).replaceAction(a); - }catch (UnsupportedOperationException e){ + }catch (Throwable e){ //ignore, replace is not supported + //JENKINS-44964 sometimes replaceAction will fail because one of the actions inserted is null + //only seen in the wild when the maven plugin is available } return Collections.singleton(a); }
JENKINS-<I> sometimes replaceAction will fail because an action in the list is null (#<I>)
jenkinsci_blueocean-plugin
train
java