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
5387ca2e2838d883986962ed9586a100c5d9a8de
diff --git a/claripy/backends/backend_z3.py b/claripy/backends/backend_z3.py index <HASH>..<HASH> 100644 --- a/claripy/backends/backend_z3.py +++ b/claripy/backends/backend_z3.py @@ -355,6 +355,7 @@ function_map['or'] = 'Or' function_map['and'] = 'And' function_map['not'] = 'Not' function_map['if'] = 'If' +function_map['iff'] = 'If' function_map['bvlshr'] = 'LShR' from ..expression import E, A
add iff->If mapping for abstracting Z3 stuff
angr_claripy
train
py
f0600e7632e65e3940c1a4cf5ab334d7362d0bce
diff --git a/app/controllers/renalware/letters/contacts_controller.rb b/app/controllers/renalware/letters/contacts_controller.rb index <HASH>..<HASH> 100644 --- a/app/controllers/renalware/letters/contacts_controller.rb +++ b/app/controllers/renalware/letters/contacts_controller.rb @@ -38,7 +38,7 @@ module Renalware end def find_contacts - CollectionPresenter.new(@patient.contacts.ordered, ContactPresenter) + CollectionPresenter.new(@patient.contacts.includes(:description).ordered, ContactPresenter) end def find_contact_descriptions
Include :description in contacts query to fix N<I>
airslie_renalware-core
train
rb
c4b18cb75f3b01da90292b94ee7192bd3e6b7dd0
diff --git a/chef/spec/unit/knife/bootstrap_spec.rb b/chef/spec/unit/knife/bootstrap_spec.rb index <HASH>..<HASH> 100644 --- a/chef/spec/unit/knife/bootstrap_spec.rb +++ b/chef/spec/unit/knife/bootstrap_spec.rb @@ -44,8 +44,10 @@ describe Chef::Knife::Bootstrap do it "should load the specified template from a Ruby gem" do @knife.config[:template_file] = false - @gem = mock('Gem').stub!(:find_files).and_return(["/Users/schisamo/.rvm/gems/ruby-1.9.2-p180@chef-0.10/gems/knife-windows-0.5.4/lib/chef/knife/bootstrap/windows-shell.erb"]) - @knife.config[:distro] = 'windows-shell' + Gem.stub(:find_files).and_return(["/Users/schisamo/.rvm/gems/ruby-1.9.2-p180@chef-0.10/gems/knife-windows-0.5.4/lib/chef/knife/bootstrap/fake-bootstrap-template.erb"]) + File.stub(:exists?).and_return(true) + IO.stub(:read).and_return('random content') + @knife.config[:distro] = 'fake-bootstrap-template' lambda { @knife.load_template }.should_not raise_error end
add additional stubbing to bootstrap_spec
chef_chef
train
rb
735e7e9110a49e96f59c3f0329a36cd9d387fe20
diff --git a/sockeye/decoder.py b/sockeye/decoder.py index <HASH>..<HASH> 100644 --- a/sockeye/decoder.py +++ b/sockeye/decoder.py @@ -849,11 +849,11 @@ class RecurrentDecoder(Decoder): # concat previous word embedding and previous hidden state if enc_last_hidden is not None: word_vec_prev = mx.sym.concat(word_vec_prev, enc_last_hidden, dim=1, - name="%sconcat_target_encoder_t%d" % (self.prefix, seq_idx)) + name="%sconcat_target_encoder_t%d" % (self.prefix, seq_idx)) rnn_input = mx.sym.concat(word_vec_prev, state.hidden, dim=1, name="%sconcat_target_context_t%d" % (self.prefix, seq_idx)) # rnn_pre_attention_output: (batch_size, rnn_num_hidden) - # next_layer_states: num_layers * [batch_size, rnn_num_hidden] + # rnn_pre_attention_layer_states: num_layers * [batch_size, rnn_num_hidden] rnn_pre_attention_output, rnn_pre_attention_layer_states = \ self.rnn_pre_attention(rnn_input, state.layer_states[:self.rnn_pre_attention_n_states])
Fixed an incorrect comment on rnn_pre_attention output. (#<I>)
awslabs_sockeye
train
py
8974a09edfd0161d19aac519b4386c04fde1f7d4
diff --git a/TYPO3.Flow/Classes/TYPO3/Flow/Resource/Storage/WritableFileSystemStorage.php b/TYPO3.Flow/Classes/TYPO3/Flow/Resource/Storage/WritableFileSystemStorage.php index <HASH>..<HASH> 100644 --- a/TYPO3.Flow/Classes/TYPO3/Flow/Resource/Storage/WritableFileSystemStorage.php +++ b/TYPO3.Flow/Classes/TYPO3/Flow/Resource/Storage/WritableFileSystemStorage.php @@ -162,10 +162,10 @@ class WritableFileSystemStorage extends FileSystemStorage implements WritableSto if (!file_exists(dirname($finalTargetPathAndFilename))) { Files::createDirectoryRecursively(dirname($finalTargetPathAndFilename)); } - if (rename($temporaryFile, $finalTargetPathAndFilename) === false) { - unlink($temporaryFile); + if (copy($temporaryFile, $finalTargetPathAndFilename) === false) { throw new StorageException(sprintf('The temporary file of the file import could not be moved to the final target "%s".', $finalTargetPathAndFilename), 1381156103); } + unlink($temporaryFile); $this->fixFilePermissions($finalTargetPathAndFilename); }
[FIX] temporary files move across volumes PHP throws a operation not permitted warning when using rename across volumes, which happens e.g. if you have FLOW_PATH_TEMPORARY_BASE pointing to a different (more performant) volume.
neos_flow-development-collection
train
php
42e5f9df47498134716bd7bf30cb246c6f6baa5b
diff --git a/lib/pickle/adapter.rb b/lib/pickle/adapter.rb index <HASH>..<HASH> 100644 --- a/lib/pickle/adapter.rb +++ b/lib/pickle/adapter.rb @@ -90,7 +90,7 @@ module Pickle end def create(attrs = {}) - @klass.send(:make, @blueprint, attrs) + @klass.send(:make!, @blueprint, attrs) end end
Fixing Machinist adaptor to work with Machinist 2
ianwhite_pickle
train
rb
933f589569ed5db74ce5e0e6043ae0305ecfb110
diff --git a/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Indexer/Fulltext/Action/Full.php b/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Indexer/Fulltext/Action/Full.php index <HASH>..<HASH> 100644 --- a/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Indexer/Fulltext/Action/Full.php +++ b/src/module-elasticsuite-catalog/Model/ResourceModel/Category/Indexer/Fulltext/Action/Full.php @@ -80,8 +80,6 @@ class Full extends Indexer ->limit($limit) ->order('e.entity_id'); - $select = $this->addActiveFilterCategoriesFilter($select); - return $this->connection->fetchAll($select); }
Fix call to undefined method addActiveFilterCategoriesFilter during indexing.
Smile-SA_elasticsuite
train
php
349d92d88924903cd26d0853b0d966a804b41b8f
diff --git a/lib/dynamoid/persistence.rb b/lib/dynamoid/persistence.rb index <HASH>..<HASH> 100644 --- a/lib/dynamoid/persistence.rb +++ b/lib/dynamoid/persistence.rb @@ -146,7 +146,8 @@ module Dynamoid # @since 0.2.0 def delete delete_indexes - Dynamoid::Adapter.delete(self.class.table_name, self.id) + options = range_key ? {:range_key => attributes[range_key]} : nil + Dynamoid::Adapter.delete(self.class.table_name, self.id, options) end # Dump this object's attributes into hash form, fit to be persisted into the datastore.
deleting an item now works with range fields
Dynamoid_dynamoid
train
rb
9f7cc13f6f01035c57a1df98c4c111010b7990ab
diff --git a/src/Util/Text.php b/src/Util/Text.php index <HASH>..<HASH> 100644 --- a/src/Util/Text.php +++ b/src/Util/Text.php @@ -373,7 +373,7 @@ class Text * * @return string */ - function toSlug($string) + public static function toSlug($string) { $string = preg_replace('/[^\p{L}\d]+/u', '-', $string); $string = iconv('UTF-8', 'US-ASCII//TRANSLIT', $string);
Bugfix (2) in phpDoc for Util methods Text::toSlug()
ansas_php-component
train
php
0900af479992fb11f0045f694d17ac898aff95f8
diff --git a/app/assets/javascripts/kmz_compressor/map_layer_manager.js b/app/assets/javascripts/kmz_compressor/map_layer_manager.js index <HASH>..<HASH> 100644 --- a/app/assets/javascripts/kmz_compressor/map_layer_manager.js +++ b/app/assets/javascripts/kmz_compressor/map_layer_manager.js @@ -70,7 +70,9 @@ window.MapLayerManager = function(map){ // Returns the layer names function layerNames(){ - return $(layers.slice(0)).map(function(){return name}) + return $.map(layers, function(layer){ + return layer.name + }) } function addLayer(layerName, kml){ diff --git a/lib/kmz_compressor/version.rb b/lib/kmz_compressor/version.rb index <HASH>..<HASH> 100644 --- a/lib/kmz_compressor/version.rb +++ b/lib/kmz_compressor/version.rb @@ -1,3 +1,3 @@ module KMZCompressor - VERSION = "2.0.2" + VERSION = "2.0.3" end
Fixed bug in layerNames that caused them to return a list of empty strings.
culturecode_kmz_compressor
train
js,rb
159a74a90567576a8f52c2a8995af4f5a0e1d7d4
diff --git a/test.py b/test.py index <HASH>..<HASH> 100644 --- a/test.py +++ b/test.py @@ -131,6 +131,18 @@ if not skipUnless: return skip return wrapper +def requires_progs(*progs): + missing = [] + for prog in progs: + try: + sh.Command(prog) + except sh.CommandNotFound: + missing.append(prog) + + friendly_missing = ", ".join(missing) + return skipUnless(len(missing) == 0, "Missing required system programs: %s" + % friendly_missing) + requires_posix = skipUnless(os.name == "posix", "Requires POSIX") requires_utf8 = skipUnless(sh.DEFAULT_ENCODING == "UTF-8", "System encoding must be UTF-8") not_osx = skipUnless(not IS_OSX, "Doesn't work on OSX") @@ -2534,6 +2546,7 @@ print("cool") # for some reason, i can't get a good stable baseline measured in this test # on osx. so skip it for now if osx @not_osx + @requires_progs("lsof") def test_no_fd_leak(self): import sh import os
mechanism for skipping test based on missing system bins
amoffat_sh
train
py
28566a834fee15a0670e13822233d8d279101d76
diff --git a/salt/states/mysql_user.py b/salt/states/mysql_user.py index <HASH>..<HASH> 100644 --- a/salt/states/mysql_user.py +++ b/salt/states/mysql_user.py @@ -39,8 +39,9 @@ def present(name, password_hash The password in hashed form. Be sure to quote the password because - YAML does't like the * - SELECT PASSWORD('mypass') ==> *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4 + YAML does't like the ``*``:: + + SELECT PASSWORD('mypass') ==> *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4 ''' ret = {'name': name, 'changes': {}, diff --git a/salt/states/virtualenv.py b/salt/states/virtualenv.py index <HASH>..<HASH> 100644 --- a/salt/states/virtualenv.py +++ b/salt/states/virtualenv.py @@ -36,7 +36,7 @@ def managed(name, Also accepts any kwargs that the virtualenv module will. - .. code-block: yaml + .. code-block:: yaml /var/www/myvirtualenv.com: virtualenv.manage:
Fixed two reST errors in states docstrings
saltstack_salt
train
py,py
617dbfb44609b6db50b1a72c20215ca093347a57
diff --git a/lib/travis/model/build.rb b/lib/travis/model/build.rb index <HASH>..<HASH> 100644 --- a/lib/travis/model/build.rb +++ b/lib/travis/model/build.rb @@ -84,7 +84,7 @@ class Build < ActiveRecord::Base end def pushes - joins(:request).where(requests: { event_type: ['push', '', nil] }) + where(:event_type => 'push') end def pull_requests
No need to JOIN request to get event_type
travis-ci_travis-core
train
rb
c7e68bdada0703d2dd0a9ae355218fc6c432ed17
diff --git a/plugins/data.headers.js b/plugins/data.headers.js index <HASH>..<HASH> 100644 --- a/plugins/data.headers.js +++ b/plugins/data.headers.js @@ -260,6 +260,11 @@ exports.from_match = function (next, connection) { if (!connection.transaction) { return next(); } var env_addr = connection.transaction.mail_from; + if (!env_addr) { + connection.transaction.results.add(plugin, {fail: 'from_match(null)'}); + return next(); + } + var hdr_from = connection.transaction.header.get('From'); if (!hdr_from) { connection.transaction.results.add(plugin, {fail: 'from_match(missing)'});
headers: skip from_match if MF is null
haraka_Haraka
train
js
e59a540d5e8240519f75a2d6487a53e7989cfe81
diff --git a/salt/modules/guestfs.py b/salt/modules/guestfs.py index <HASH>..<HASH> 100644 --- a/salt/modules/guestfs.py +++ b/salt/modules/guestfs.py @@ -46,3 +46,4 @@ def mount(location, access='rw'): break cmd = 'guestmount -i -a {0} --{1} {2}'.format(location, access, root) __salt__['cmd.run'](cmd) + return root
guestfs needs to return the path to the mount point
saltstack_salt
train
py
7f1a7450217643f336e4b0ea98b21405bdae2cc4
diff --git a/src/descriptors/SqliteDescriptor.php b/src/descriptors/SqliteDescriptor.php index <HASH>..<HASH> 100644 --- a/src/descriptors/SqliteDescriptor.php +++ b/src/descriptors/SqliteDescriptor.php @@ -26,10 +26,10 @@ class SqliteDescriptor extends \ntentan\atiaa\Descriptor { $foreignKeys = []; $pragmaColumns = $this->driver->query("pragma foreign_key_list({$table['name']})"); - foreach($pragmaColumns as $foreignKey) + foreach($pragmaColumns as $i => $foreignKey) { $foreignKeys[] = [ - 'name' => "{$table['name']}_{$foreignKey['table']}_fk", + 'name' => "{$table['name']}_{$foreignKey['table']}_{$i}_fk", 'schema' => $table['schema'], 'table' => $table['name'], 'column' => $foreignKey['from'], @@ -40,6 +40,7 @@ class SqliteDescriptor extends \ntentan\atiaa\Descriptor 'on_delete' => $foreignKey['on_delete'] ]; } + return $foreignKeys; }
Added a way to get sqlite foreign keys on the same table to be represented differently.
ntentan_atiaa
train
php
a8d22bbfb096adee64bea938d71670a945d16f81
diff --git a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java index <HASH>..<HASH> 100644 --- a/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java +++ b/src/main/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java @@ -301,7 +301,7 @@ public class BinaryExpressionMultiTypeDispatcher extends BinaryExpressionHelper operandStack.load(ClassHelper.int_TYPE, subscriptValueId); operandStack.swap(); bew.arraySet(false); - operandStack.remove(2); + operandStack.remove(3); // 3 operands, the array, the index and the value! // load return value operandStack.load(rightType, resultValueId);
fix array set operator popping error. since only 2 operators where removed, but it should have been 3, there have been possible pops from empty stacks, which can result in VerifyError
apache_groovy
train
java
cf5e9ccf364201a4faae48d9eaf692d722f53462
diff --git a/lib/figleaf/settings.rb b/lib/figleaf/settings.rb index <HASH>..<HASH> 100644 --- a/lib/figleaf/settings.rb +++ b/lib/figleaf/settings.rb @@ -62,8 +62,8 @@ module Figleaf property = YAML.load(ERB.new(IO.read(file_path)).result) property = property[env] if env use_hashie_if_hash(property) - rescue Psych::SyntaxError - raise InvalidYAML, "#{file_path} has invalid YAML" + rescue Psych::SyntaxError => e + raise InvalidYAML, "#{file_path} has invalid YAML\n" + e.message end def root
Include original message which shows where in the file the error is
jcmuller_figleaf
train
rb
0baf6965204c15a27d34d4ef9973e1662f9a624e
diff --git a/tests/integration/standard/test_concurrent.py b/tests/integration/standard/test_concurrent.py index <HASH>..<HASH> 100644 --- a/tests/integration/standard/test_concurrent.py +++ b/tests/integration/standard/test_concurrent.py @@ -24,6 +24,8 @@ from cassandra.query import tuple_factory, SimpleStatement from tests.integration import use_singledc, PROTOCOL_VERSION +from six import next + try: import unittest2 as unittest except ImportError: @@ -151,7 +153,7 @@ class ClusterTests(unittest.TestCase): results = self.execute_concurrent_args_helper(self.session, statement, parameters, results_generator=True) for i in range(num_statements): - result = results.next() + result = next(results) self.assertEqual((True, [(i,)]), result) def test_execute_concurrent_paged_result(self):
Fix use of next() in test_concurrent
datastax_python-driver
train
py
31e1804ff9307d47f739d61874660fe0e1d93deb
diff --git a/src/psalm.php b/src/psalm.php index <HASH>..<HASH> 100644 --- a/src/psalm.php +++ b/src/psalm.php @@ -193,7 +193,7 @@ Options: If greater than one, Psalm will run analysis on multiple threads, speeding things up. --report=PATH - The path where to output report file. The output format is base on the file extension. + The path where to output report file. The output format is based on the file extension. (Currently supported format: ".json", ".xml", ".txt", ".emacs") --clear-cache
Fix typo in --help ("is base" -> "is based")
vimeo_psalm
train
php
b2549b4498493671aae7eff8c124edaab2705188
diff --git a/lib/Honeybadger/Logger.php b/lib/Honeybadger/Logger.php index <HASH>..<HASH> 100644 --- a/lib/Honeybadger/Logger.php +++ b/lib/Honeybadger/Logger.php @@ -2,6 +2,9 @@ namespace Honeybadger; +use \Honeybadger\Errors\NonExistentProperty; +use \Honeybadger\Errors\ReadOnly; + /** * Abstract logger. Should be extended to add support for various frameworks and * libraries utilizing Honeybadger. @@ -39,6 +42,25 @@ abstract class Logger { $this->threshold = $threshold; } + public function __get($key) + { + switch ($key) + { + case 'logger': + case 'threshold': + return $this->$key; + break; + default: + throw new NonExistentProperty($this, $key); + break; + } + } + + public function __set($key, $value) + { + throw new ReadOnly($this); + } + /** * Adds a new debug log entry with the supplied `$message`, replacing * with `$variables`, if any. If the threshold is lower than
Allow access to wrapper logger and threshold
honeybadger-io_honeybadger-php
train
php
d8cdeb0900b667371138c753e82dd59f64858aa3
diff --git a/songtext/base.py b/songtext/base.py index <HASH>..<HASH> 100644 --- a/songtext/base.py +++ b/songtext/base.py @@ -1,3 +1,4 @@ +from lxml import html import requests diff --git a/songtext/lyricsnmusic.py b/songtext/lyricsnmusic.py index <HASH>..<HASH> 100644 --- a/songtext/lyricsnmusic.py +++ b/songtext/lyricsnmusic.py @@ -1,6 +1,9 @@ +# LYRICSnMUSIC API wrapper +# Documentation: http://www.lyricsnmusic.com/api + + import os -from lxml import html import requests from base import BaseTrack, BaseTrackList @@ -29,14 +32,6 @@ class Track(BaseTrack): CSS_SELECTOR = "pre[itemprop='description']" - def __init__(self, url): - self.url = url - self.response = requests.get(url) - - @property - def html_string(self): - return html.document_fromstring(self.response.text) - def get_lyrics(self): try: print u'{0}\n\n'.format(
oops, those methods are defined in BaseTrack
ysim_songtext
train
py,py
a2b54889913a77b60097e2924d5a627e2966fc8e
diff --git a/tests/store.js b/tests/store.js index <HASH>..<HASH> 100644 --- a/tests/store.js +++ b/tests/store.js @@ -136,13 +136,7 @@ exports['should indicate async actions'] = function (test) { }; exports['should indicate when async actions are running'] = function (test) { - var count = 0; - var ctrl = Lib.Controller({ - onStoreChange: function () { - count++; - } - }); - ctrl.store.toggleKeepState(); + var ctrl = Lib.Controller(); ctrl.signal('test', [function (args, state, next) { next(); }]);
trying to understand why only Travis fails this test
cerebral_cerebral
train
js
f59f3d672e9e7e00263eb344b2ee09c16a275215
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 @@ -65,6 +65,7 @@ def mas_net_http(response) http.stub!(:request).and_return(response) http.stub!(:start).and_yield(http) http.stub!(:use_ssl=) + http.stub!(:verify_mode=) http end
Added :verify_mode= stub for stubbed Net::HTTP
twitter4r_twitter4r-core
train
rb
f0c9d03d87e78560520fad91cf9bbc0bc34d7514
diff --git a/khard/khard.py b/khard/khard.py index <HASH>..<HASH> 100644 --- a/khard/khard.py +++ b/khard/khard.py @@ -542,18 +542,17 @@ def load_address_books(names, config, search_queries=None): """ result = [] - if names: - # load address books which are defined in the configuration file - for name in names: - address_book = config.get_address_book(name, search_queries) - if address_book is None: - sys.exit( - 'Error: The entered address book "{}" does not exist.\n' - 'Possible values are: {}'.format(name, ', '.join( - str(book) for book in config.get_all_address_books()))) - else: - result.append(address_book) - else: + # load address books which are defined in the configuration file + for name in names: + address_book = config.get_address_book(name, search_queries) + if address_book is None: + sys.exit('Error: The entered address book "{}" does not exist.\n' + 'Possible values are: {}'.format(name, ', '.join( + str(book) for book in config.get_all_address_books()))) + else: + result.append(address_book) + # In case names were empty and the for loop did not run. + if not result and not names: # load contacts of all address books for address_book in config.get_all_address_books(): result.append(config.get_address_book(address_book.name,
Simplify for loop and if conditions interaction
scheibler_khard
train
py
2d24936ef18ac8fb57a3e97d2ca1d0a1663ad0fc
diff --git a/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/DiffCommand.php b/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/DiffCommand.php index <HASH>..<HASH> 100644 --- a/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/DiffCommand.php +++ b/lib/Doctrine/DBAL/Migrations/Tools/Console/Command/DiffCommand.php @@ -116,7 +116,7 @@ EOT ); if (! $up && ! $down) { - $output->writeln('No changes detected in your mapping information.', 'ERROR'); + $output->writeln('No changes detected in your mapping information.'); return; }
Fix writeln call when no changes are to be done (#<I>)
doctrine_migrations
train
php
168f548d32ae7fd8f7c39db09ee0864ac1b1a158
diff --git a/pachyderm/plot.py b/pachyderm/plot.py index <HASH>..<HASH> 100644 --- a/pachyderm/plot.py +++ b/pachyderm/plot.py @@ -104,10 +104,14 @@ def configure() -> None: # why that might be preferable here. # Setup the LaTeX preamble - # Enable AMS math package (for among other things, "\text") - matplotlib.rcParams["text.latex.preamble"].append(r"\usepackage{amsmath}") - # Add fonts that will be used below. See the `mathtext` fonts set below for further info. - matplotlib.rcParams["text.latex.preamble"].append(r"\usepackage{sfmath}") + matplotlib.rcParams["text.latex.preamble"] = [ + # Enable AMS math package (for among other things, "\text") + r"\usepackage{amsmath}", + # Add fonts that will be used below. See the `mathtext` fonts set below for further info. + r"\usepackage{sfmath}", + # Ensure that existing values are included. + matplotlib.rcParams["text.latex.preamble"], + ] params = { # Enable latex "text.usetex": True,
Fix for latex preamble changes in MPL <I> Now it cannot be appended to directly. Instead, we have to set a list and explicitly add the previous values
raymondEhlers_pachyderm
train
py
bdf882f5b7b49bf61f3df539f87442cc1b663edc
diff --git a/src/Service/Sale/Order/Delete.php b/src/Service/Sale/Order/Delete.php index <HASH>..<HASH> 100644 --- a/src/Service/Sale/Order/Delete.php +++ b/src/Service/Sale/Order/Delete.php @@ -109,6 +109,7 @@ class Delete if ($cleanDb) { /* TODO: move PV related stuff to PV module */ $this->removeSalePv($saleId); + $this->removeSaleGrid($saleId); $this->removeSale($saleId); } } @@ -155,6 +156,13 @@ class Delete $this->repoGeneric->deleteEntityByPk($entity, $id); } + private function removeSaleGrid($saleId) + { + $entity = Cfg::ENTITY_MAGE_SALES_ORDER_GRID; + $id = [Cfg::E_SALE_ORDER_GRID_A_ENTITY_ID => $saleId]; + $this->repoGeneric->deleteEntityByPk($entity, $id); + } + private function removeSaleItem($saleItemId) { $entity = Cfg::ENTITY_MAGE_SALES_ORDER_ITEM;
MOBI-<I> Delete order operation
praxigento_mobi_mod_warehouse
train
php
26f7024273c9429fca3001b6cca1ec13264c2b21
diff --git a/lib/capnotify.rb b/lib/capnotify.rb index <HASH>..<HASH> 100644 --- a/lib/capnotify.rb +++ b/lib/capnotify.rb @@ -39,7 +39,7 @@ module Capnotify _cset(:capnotify_appname) do name = [ fetch(:application, nil), fetch(:stage, nil) ].compact.join(" ") if fetch(:branch, nil) - name = "name / #{ branch }" + name = "#{ name } / #{ branch }" end name end diff --git a/lib/capnotify/version.rb b/lib/capnotify/version.rb index <HASH>..<HASH> 100644 --- a/lib/capnotify/version.rb +++ b/lib/capnotify/version.rb @@ -1,3 +1,3 @@ module Capnotify - VERSION = "0.1.3pre" + VERSION = "0.1.4pre" end diff --git a/spec/capnotify_spec.rb b/spec/capnotify_spec.rb index <HASH>..<HASH> 100644 --- a/spec/capnotify_spec.rb +++ b/spec/capnotify_spec.rb @@ -178,6 +178,14 @@ describe Capnotify do config.set :branch, 'mybranch' end + it "should include the application name" do + config.capnotify_appname.should match(/SimpleApp/) + end + + it "should include the stage name" do + config.capnotify_appname.should match(/production/) + end + it "should contain the branch name" do config.capnotify_appname.should match(/mybranch/) end
fixed capnotify_appname when branch is specified had a typo where it was putting "name" in the name if the branch was specified
spikegrobstein_capnotify
train
rb,rb,rb
c82f75bad1901c42648af9db4cf72484bfbe1ad3
diff --git a/gridmap/job.py b/gridmap/job.py index <HASH>..<HASH> 100644 --- a/gridmap/job.py +++ b/gridmap/job.py @@ -752,8 +752,10 @@ def _append_job_to_session(session, job, temp_dir='/scratch/', quiet=True): # set job fields that depend on the job_id assigned by grid engine job.id = job_id - job.log_stdout_fn = os.path.join(temp_dir, '{}.o{}'.format(job.name, job_id)) - job.log_stderr_fn = os.path.join(temp_dir, '{}.e{}'.format(job.name, job_id)) + job.log_stdout_fn = os.path.join(temp_dir, '{}.o{}'.format(job.name, + job_id)) + job.log_stderr_fn = os.path.join(temp_dir, '{}.e{}'.format(job.name, + job_id)) if not quiet: print('Your job {} has been submitted with id {}'.format(job.name,
PEP8 compliance in job.py
pygridtools_gridmap
train
py
61921155f860f0af8b6b5703e24d201437c8f1e4
diff --git a/validator_test.go b/validator_test.go index <HASH>..<HASH> 100644 --- a/validator_test.go +++ b/validator_test.go @@ -1878,6 +1878,9 @@ func TestErrorsByField(t *testing.T) { post := &Post{Title: "My123", Message: "duck13126", AuthorIP: "123"} _, err := ValidateStruct(post) errs := ErrorsByField(err) + if len(errs) != 2 { + t.Errorf("There should only be 2 errors but got %v", len(errs)) + } for _, test := range tests { if actual, ok := errs[test.param]; !ok || actual != test.expected {
Added additional test to check for the number of errors returned to be correct.
asaskevich_govalidator
train
go
b267ca42cc53afdf3cec8846ec7a5e54c49788bf
diff --git a/lib/flapjack/applications/worker.rb b/lib/flapjack/applications/worker.rb index <HASH>..<HASH> 100644 --- a/lib/flapjack/applications/worker.rb +++ b/lib/flapjack/applications/worker.rb @@ -53,7 +53,7 @@ module Flapjack class_name = config[:type].to_s.camel_case filename = File.join(basedir, "#{config[:type]}.rb") - @log.info("Loading the #{class_name} transport") + @log.info("Loading the #{class_name} transport for queue: #{queue_name}.") begin require filename
log which queue name we're connecting to
flapjack_flapjack
train
rb
15a5c2f0dd6684641bef6e929a172ba48c395220
diff --git a/vaex/multithreading.py b/vaex/multithreading.py index <HASH>..<HASH> 100644 --- a/vaex/multithreading.py +++ b/vaex/multithreading.py @@ -111,6 +111,11 @@ class ThreadPoolIndex(object): done = yielded == count return results finally: + # clean up in case of an exception + for other_job in alljobs: + other_job.cancel() + while not self.queue_out.empty(): + self.queue_out.get() self._working = False #self.jobs = [] self.new_jobs_event.clear()
cleanup on exit, for instance ctrl-c in notebook
vaexio_vaex
train
py
56dfe6630fc546fd650d8d0e5aa56c1f15efeb91
diff --git a/src/crypto/index.js b/src/crypto/index.js index <HASH>..<HASH> 100644 --- a/src/crypto/index.js +++ b/src/crypto/index.js @@ -951,6 +951,15 @@ Crypto.prototype.forceDiscardSession = function(roomId) { * the device query is always inhibited as the members are not tracked. */ Crypto.prototype.setRoomEncryption = async function(roomId, config, inhibitDeviceQuery) { + // ignore crypto events with no algorithm defined + // This will happen if a crypto event is redacted before we fetch the room state + // It would otherwise just throw later as an unknown algorithm would, but we may + // as well catch this here + if (!config.algorithm) { + console.log("Ignoring setRoomEncryption with no algorithm"); + return; + } + // if state is being replayed from storage, we might already have a configuration // for this room as they are persisted as well. // We just need to make sure the algorithm is initialized in this case.
Ignore crypto events with no content
matrix-org_matrix-js-sdk
train
js
fc7d5d0d6d8e39af3d4329697f1a06492c8931a7
diff --git a/Gruntfile.js b/Gruntfile.js index <HASH>..<HASH> 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -161,6 +161,7 @@ module.exports = function(grunt) { grunt.registerTask("default", ["newer:copy:build", "mkdir:build", "newer:shell:regexp", "newer:fix_jison:regexp", + "npmignore", "chmod"]); grunt.registerMultiTask("fix_jison", function () { @@ -180,6 +181,12 @@ module.exports = function(grunt) { return undefined; }); + grunt.registerTask("npmignore", function () { + var data = "bin/parse.js"; + fs.writeFileSync("build/dist/.npmignore", data); + }); + + grunt.registerTask("copy_jsdoc_template", ["copy:jsdoc_template_defaults", "copy:publish_js", "copy:layout_tmpl",
Added the npmignore task.
mangalam-research_salve
train
js
92155fe0ac930530b263ba42f1eda74e08a9c864
diff --git a/lib/listeners/history.js b/lib/listeners/history.js index <HASH>..<HASH> 100644 --- a/lib/listeners/history.js +++ b/lib/listeners/history.js @@ -1,4 +1,3 @@ -#!/usr/bin/env node // // lib/listeners/history.js // @@ -11,4 +10,12 @@ exports = module.exports = function (app) { + var $ = require('jquery-browserify') + + $(document).ready(function () { + } + + window.onpopstate = function (event) { + console.log('Location: '+ document.location +', state: '+ JSON.stringify(event.state)) + } } \ No newline at end of file
Added a little debugger info for now.
leeola_tork
train
js
5623dab807144c2af75daf93214913c6a3102a19
diff --git a/gosu-core/src/main/java/gw/internal/gosu/ir/transform/AbstractElementTransformer.java b/gosu-core/src/main/java/gw/internal/gosu/ir/transform/AbstractElementTransformer.java index <HASH>..<HASH> 100644 --- a/gosu-core/src/main/java/gw/internal/gosu/ir/transform/AbstractElementTransformer.java +++ b/gosu-core/src/main/java/gw/internal/gosu/ir/transform/AbstractElementTransformer.java @@ -1014,7 +1014,8 @@ public abstract class AbstractElementTransformer<T extends IParsedElement> } else { - return nullLiteral(); + // Note we cast the Null value to make ASM's stack map frame calculations work, otherwise ASM has a bug where it calculates the wrong type + return checkCast( type, nullLiteral() ); } }
cast null value for implicit local var initialization, this is purely for ASM's stack map frame calculations, otherwise ASM has a bug where it determines the wrong type which may cause a bytecode verify error
gosu-lang_gosu-lang
train
java
d7056eeceb1867926611c452b18e3ec583617b52
diff --git a/index.js b/index.js index <HASH>..<HASH> 100644 --- a/index.js +++ b/index.js @@ -81,7 +81,7 @@ var createScheduler = function createScheduler(optName) { var length = this.schedulablesList.push(object); var index = length - 1; var name = object.name ? object.name : object.schedulingID; - console.log("Scheduling element #" + index + ' \"' + name + '\"'); + console.log("add():", this.name, "scheduling element #" + index + ' \"' + name + '\"'); if (!this.isRunning) { // this.resetAll(); }
Cleaned up a bunch of console.log() debugging messages.
wavesjs_waves-masters
train
js
40270285fde3049e0457ff37dbeb55ca29984e90
diff --git a/lib/async.js b/lib/async.js index <HASH>..<HASH> 100644 --- a/lib/async.js +++ b/lib/async.js @@ -39,20 +39,18 @@ }; function only_once(fn) { - var called = false; return function() { - if (called) throw new Error("Callback was already called."); - called = true; + if (fn === null) throw new Error("Callback was already called."); fn.apply(this, arguments); + fn = null; }; } function _once(fn) { - var called = false; return function() { - if (called) return; - called = true; + if (fn === null) return; fn.apply(this, arguments); + fn = null; }; }
once: ensure fn is gced
caolan_async
train
js
2e768caf24c83a7224d5fbf11d6a8bb8297a85e8
diff --git a/python/orca/src/bigdl/orca/data/elastic_search.py b/python/orca/src/bigdl/orca/data/elastic_search.py index <HASH>..<HASH> 100644 --- a/python/orca/src/bigdl/orca/data/elastic_search.py +++ b/python/orca/src/bigdl/orca/data/elastic_search.py @@ -43,7 +43,7 @@ class elastic_search: sqlContext = SQLContext.getOrCreate(sc) spark = sqlContext.sparkSession - reader = spark.read_df.format("org.elasticsearch.spark.sql") + reader = spark.read.format("org.elasticsearch.spark.sql") for key in esConfig: reader.option(key, esConfig[key])
fix es_read typo (#<I>)
intel-analytics_BigDL
train
py
34609c6c22931b204ceb5f54623f3a48f48dac70
diff --git a/builtin/providers/aws/resource_aws_route53_record_test.go b/builtin/providers/aws/resource_aws_route53_record_test.go index <HASH>..<HASH> 100644 --- a/builtin/providers/aws/resource_aws_route53_record_test.go +++ b/builtin/providers/aws/resource_aws_route53_record_test.go @@ -50,7 +50,7 @@ func TestExpandRecordName(t *testing.T) { } } -func TestAccRoute53Record(t *testing.T) { +func TestAccRoute53Record_basic(t *testing.T) { resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, Providers: testAccProviders,
provider/aws: Change Route <I> record test name, so it can be ran individually
hashicorp_terraform
train
go
cba8955bd9b84eafdb179929c4834291c0224dab
diff --git a/src/CornerstoneViewport/CornerstoneViewport.js b/src/CornerstoneViewport/CornerstoneViewport.js index <HASH>..<HASH> 100644 --- a/src/CornerstoneViewport/CornerstoneViewport.js +++ b/src/CornerstoneViewport/CornerstoneViewport.js @@ -107,7 +107,6 @@ class CornerstoneViewport extends Component { imageIdIndex, // Maybe imageProgress: 0, isLoading: true, - numImagesLoaded: 0, error: null, // Overlay scale: undefined, @@ -127,6 +126,8 @@ class CornerstoneViewport extends Component { this.startLoadHandler = this.props.startLoadHandler; this.endLoadHandler = this.props.endLoadHandler; this.loadHandlerTimeout = undefined; // "Loading..." timer + + this.numImagesLoaded = 0; } // ~~ LIFECYCLE @@ -686,9 +687,7 @@ class CornerstoneViewport extends Component { onImageLoaded = () => { // TODO: This is not necessarily true :thinking: // We need better cache reporting a layer up - this.setState({ - numImagesLoaded: this.state.numImagesLoaded + 1, - }); + this.numImagesLoaded++; }; onImageProgress = e => {
fix: shift numImages out of state to avoid re-renders (unused)
cornerstonejs_react-cornerstone-viewport
train
js
c9bd9bd3d0003bd30858f9d2d3088972d74b0f7e
diff --git a/lib/s3sync/sync.rb b/lib/s3sync/sync.rb index <HASH>..<HASH> 100644 --- a/lib/s3sync/sync.rb +++ b/lib/s3sync/sync.rb @@ -306,7 +306,9 @@ module S3Sync # etag comes back with quotes (obj.etag.inspcet # => "\"abc...def\"" small_comparator = lambda { obj.etag[/[a-z0-9]+/] } node = Node.new(location.path, obj.key, obj.content_length, small_comparator) - nodes[node.path] = node + # The key is relative path from dir. + key = node.path[(dir || "").length,node.path.length - 1] + nodes[key] = node end return nodes end
Use relative path for node check key in S3 files.
clarete_s3sync
train
rb
cd44dc589edf3035e565b6cbc6eae9a1708233b0
diff --git a/src/main/java/org/activiti/camel/ActivitiComponent.java b/src/main/java/org/activiti/camel/ActivitiComponent.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/activiti/camel/ActivitiComponent.java +++ b/src/main/java/org/activiti/camel/ActivitiComponent.java @@ -23,8 +23,11 @@ public class ActivitiComponent extends DefaultComponent { private RuntimeService runtimeService; - public ActivitiComponent(CamelContext context) { - super(context); + public ActivitiComponent() {} + + @Override + public void setCamelContext(CamelContext context) { + super.setCamelContext(context); runtimeService = getByType(context, RuntimeService.class); }
ACT-<I> added blueprint support in activiti-camel
camunda_camunda-bpm-camel
train
java
07849549e62efb4bd63438940ad11b7cb2702ea6
diff --git a/lib/sprockets/processing.rb b/lib/sprockets/processing.rb index <HASH>..<HASH> 100644 --- a/lib/sprockets/processing.rb +++ b/lib/sprockets/processing.rb @@ -202,7 +202,9 @@ module Sprockets processors += config[:postprocessors][type] if type != file_type && processor = transformers[file_type][type] + processors += config[:preprocessors][type] processors += [processor] + processors += config[:postprocessors][file_type] end processors += engine_extnames.map { |ext| engines[ext] } diff --git a/test/test_environment.rb b/test/test_environment.rb index <HASH>..<HASH> 100644 --- a/test/test_environment.rb +++ b/test/test_environment.rb @@ -619,7 +619,7 @@ class TestEnvironment < Sprockets::TestCase assert asset = @env.find_asset("logo.png") assert_equal "image/png", asset.content_type - assert_equal [:pre_svg, :post_png], asset.metadata[:test] + assert_equal [:pre_svg, :post_svg, :pre_png, :post_png], asset.metadata[:test] end test "access selector count metadata" do
Include pre/post when running transformers
rails_sprockets
train
rb,rb
3662f8c4d0afc2dd39b3ef3a771ba49fede8ee90
diff --git a/cake/libs/configure.php b/cake/libs/configure.php index <HASH>..<HASH> 100644 --- a/cake/libs/configure.php +++ b/cake/libs/configure.php @@ -893,7 +893,9 @@ class App extends Object { continue; } if (!isset($_this->__paths[$path])) { - $_this->import('Folder'); + if (!class_exists('Folder')) { + require LIBS . 'folder.php'; + } $Folder =& new Folder(); $directories = $Folder->tree($path, false, 'dir'); $_this->__paths[$path] = $directories;
Changing how Folder Class is loaded. Fixes infinite loops resulting in segfault under apache 2 when Cache.disable = true and debug = 0. Closes #<I> git-svn-id: <URL>
cakephp_cakephp
train
php
81402d32c520649fe2299801b81e812e2f1e0453
diff --git a/src/Definition/Plugin/NamespaceDefinitionPlugin.php b/src/Definition/Plugin/NamespaceDefinitionPlugin.php index <HASH>..<HASH> 100644 --- a/src/Definition/Plugin/NamespaceDefinitionPlugin.php +++ b/src/Definition/Plugin/NamespaceDefinitionPlugin.php @@ -216,7 +216,11 @@ class NamespaceDefinitionPlugin extends AbstractDefinitionPlugin $name = lcfirst($namespace); $typeName = ucfirst($namespace).(($definition instanceof MutationDefinition) ? $mutationSuffix : $querySuffix); if (!$root) { - $root = $this->createRootNamespace(\get_class($definition), $name, $typeName, $endpoint); + if (isset($namespacedDefinitions[$name])) { + $root = $namespacedDefinitions[$name]; + } else { + $root = $this->createRootNamespace(\get_class($definition), $name, $typeName, $endpoint); + } $parent = $endpoint->getType($root->getType()); $namespacedDefinitions[$root->getName()] = $root; } else {
fix: does not override operations using the same namespace
ynloultratech_graphql-bundle
train
php
4cefa2782c565712f458a4d7c4a4026f941f6e4b
diff --git a/src/runner.js b/src/runner.js index <HASH>..<HASH> 100644 --- a/src/runner.js +++ b/src/runner.js @@ -389,7 +389,11 @@ async function runTest(test, logs) { } else { file.passCount += 1 if (runner.verbose) { - logs.prepend(indent + huey.green('✦ ') + getTestName(test) + '\n') + if (logs.length) { + logs.ln() + logs.prepend('') + } + logs.prepend(indent + huey.green('✦ ') + getTestName(test)) } else { logs.quiet = true } @@ -455,10 +459,10 @@ async function runGroup(group) { logs = mockConsole(true) logs.quiet = runner.quiet } - log('') try { await runAll(group.afterEach) } finally { + logs.ln() logs.exec() } } else if (test.fn) {
fix: ensure an empty line exists between sections Where "sections" refers to: - test names - test logs - test errors - beforeEach logs - afterEach logs NOTE: If a test has no logs, no empty line will exist between its name and the next test's name.
aleclarson_testpass
train
js
6e43a5f4a04e6bd8cbef3b62b47c867b97a10f22
diff --git a/lib/index.js b/lib/index.js index <HASH>..<HASH> 100644 --- a/lib/index.js +++ b/lib/index.js @@ -25,6 +25,10 @@ async function prompt(questions=[], { onSubmit=noop, onCancel=noop }={}) { continue; // take val & run } + if (typeof question.message !== 'string') { + throw new Error('prompt message is required'); + } + // if property is a function, invoke it unless it's ignored for (key in question) { if (ignore.includes(key)) continue; diff --git a/lib/prompts.js b/lib/prompts.js index <HASH>..<HASH> 100644 --- a/lib/prompts.js +++ b/lib/prompts.js @@ -4,10 +4,6 @@ const el = require('./elements'); const noop = v => v; function toPrompt(type, args, opts={}) { - if (typeof args.message !== 'string') { - throw new Error('message is required'); - } - return new Promise((res, rej) => { const p = new el[type](args); const onAbort = opts.onAbort || noop;
move `o.message` throw into main loop
terkelg_prompts
train
js,js
1fe20557437385654ba5cd74e94dda946a56fd62
diff --git a/pkg/api/api.go b/pkg/api/api.go index <HASH>..<HASH> 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -245,7 +245,7 @@ func Register(r *macaron.Macaron) { r.Put("/:alertId/state", bind(m.UpdateAlertStateCommand{}), wrap(PutAlertState)) r.Get("/:alertId", ValidateOrgAlert, wrap(GetAlert)) - r.Delete("/:alertId", ValidateOrgAlert, wrap(DelAlert)) + //r.Delete("/:alertId", ValidateOrgAlert, wrap(DelAlert)) disabled until we know how to handle it dashboard updates r.Get("/", wrap(GetAlerts)) })
tech(alerting): disable DEL for alert rules in the api
grafana_grafana
train
go
8fcb325cbaca6d3f72646483b14a508f36c311e4
diff --git a/src/Model/User.php b/src/Model/User.php index <HASH>..<HASH> 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -2180,7 +2180,11 @@ class User extends Base $oEmail->data = new \stdClass(); // Add required user data to the email - $oEmail->data->user->username = $aUserData['username']; + $oEmail->data = (object) [ + 'user' => (object) [ + 'username' => $aUserData['username'] + ] + ]; // If this user is created by an admin then take note of that. if ($this->isAdmin() && $this->activeUser('id') != $iId) {
Improving the way the email data object is built
nails_module-auth
train
php
315137e8ff08a1d84f20d79c89dbd22830160b61
diff --git a/Tests/Config/Processor/InheritanceProcessorTest.php b/Tests/Config/Processor/InheritanceProcessorTest.php index <HASH>..<HASH> 100644 --- a/Tests/Config/Processor/InheritanceProcessorTest.php +++ b/Tests/Config/Processor/InheritanceProcessorTest.php @@ -17,7 +17,7 @@ class InheritanceProcessorTest extends TestCase /** * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Type "toto" inherits by "bar" not found. + * @expectedExceptionMessage Type "toto" inherited by "bar" not found. */ public function testExtendsUnknownType() { @@ -53,7 +53,7 @@ class InheritanceProcessorTest extends TestCase /** * @expectedException \InvalidArgumentException - * @expectedExceptionMessage Type "toto" can't inherits "bar" because "enum" is not allowed type (["object","interface"]). + * @expectedExceptionMessage Type "bar" can't inherit "toto" because its type ("enum") is not allowed type (["object","interface"]). */ public function testNotAllowedType() {
Update InheritanceProcessorTest.php
overblog_GraphQLBundle
train
php
678ed16b9d1111489dd35df1d0be4fda856c64fe
diff --git a/js/whitebit.js b/js/whitebit.js index <HASH>..<HASH> 100644 --- a/js/whitebit.js +++ b/js/whitebit.js @@ -1021,12 +1021,12 @@ module.exports = class whitebit extends Exchange { let method = 'v4PrivatePostMainAccountAddress'; if (this.isFiat (code)) { method = 'v4PrivatePostMainAccountFiatDepositUrl'; - const provider = this.safeNumber2 (params, 'provider'); + const provider = this.safeNumber (params, 'provider'); if (provider === undefined) { throw new ArgumentsRequired (this.id + ' fetchDepositAddress() requires a provider when the ticker is fiat'); } request['provider'] = provider; - const amount = this.safeNumber2 (params, 'amount'); + const amount = this.safeNumber (params, 'amount'); if (amount === undefined) { throw new ArgumentsRequired (this.id + ' fetchDepositAddress() requires an amount when the ticker is fiat'); }
safeNumber2 -> safeNumber
ccxt_ccxt
train
js
d8864e199e43a8bf2fbd6759442f36dfc382d9e2
diff --git a/webroot/js/cart.js b/webroot/js/cart.js index <HASH>..<HASH> 100644 --- a/webroot/js/cart.js +++ b/webroot/js/cart.js @@ -445,6 +445,9 @@ foodcoopshop.Cart = { }, getCartProductHtml: function (productId, amount, price, productName, unity, manufacturerLink, image, deposit, tax, timebasedCurrencyHours, orderedQuantityInUnits, unitName, unitAmount, priceInclPerUnit, pickupDay) { + + priceInclPerUnit = parseFloat(priceInclPerUnit); + var imgHtml = '<span class="image">' + image + '</span>'; if (!$(image).attr('src').match(/de-default-home/)) { imgHtml = '<a href="javascript:void(0);" data-modal-title="' + productName + '" data-modal-image="' + $(image).attr('src').replace(/-home_/, '-thickbox_') + '" class="image">' + image + '</a>';
fix: entering weight multiple times causes wrong price
foodcoopshop_foodcoopshop
train
js
a989437cce4a3629e4c3436f826204aff197922c
diff --git a/lib/conditions/predefined.js b/lib/conditions/predefined.js index <HASH>..<HASH> 100644 --- a/lib/conditions/predefined.js +++ b/lib/conditions/predefined.js @@ -62,7 +62,8 @@ module.exports = [ type: 'object', properties: { pattern: { - type: 'string' + type: 'string', + format: 'regex' } }, required: ['pattern'] @@ -94,8 +95,13 @@ module.exports = [ type: 'object', properties: { methods: { - type: ['string', 'array'], - items: { type: 'string' } + anyOf: [{ + type: 'string', + enum: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'] + }, { + type: 'array', + items: { type: 'string', enum: ['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'HEAD', 'OPTIONS'] } + }] } }, required: ['methods']
Tweak some JSON Schemas
ExpressGateway_express-gateway
train
js
fba69f20923476f30f0452701dc8bbac3b82b867
diff --git a/juicer/juicer/Juicer.py b/juicer/juicer/Juicer.py index <HASH>..<HASH> 100644 --- a/juicer/juicer/Juicer.py +++ b/juicer/juicer/Juicer.py @@ -199,7 +199,7 @@ class Juicer(object): cart.load(cart_name) else: cln = juicer.utils.get_login_info()[1]['start_in'] - cart = juicer.utils.cart_db()[cln].find_one({'_id': cart_name}) + cart = juicer.common.Cart.Cart(juicer.utils.cart_db()[cln].find_one({'_id': {'$regex': cart_name}})) return str(cart) def list(self, cart_glob=['*.json']):
`juicer show` will check remote carts via regex for #<I> this uses mongodb regex syntax
juicer_juicer
train
py
5aab8d8bfda9cc414c9591d94be313f315df2b84
diff --git a/start.py b/start.py index <HASH>..<HASH> 100644 --- a/start.py +++ b/start.py @@ -6,7 +6,8 @@ template = """ <th style="text-align:center">AiiDA Lab widgets</th> <tr> <td valign="top"><ul> - <li><a href="{appbase}/structures.ipynb" target="_blank">Dealing with structures</a></li> + <li><a href="{appbase}/structures.ipynb" target="_blank">Dealing with one structure</a></li> + <li><a href="{appbase}/structures_multi.ipynb" target="_blank">Dealing with multiple structures</a></li> <li><a href="{appbase}/example.ipynb" target="_blank">Dealing with codes</a></li> </ul></td> </tr>
Add reference to structures_muli.ipynb in start.py
aiidalab_aiidalab-widgets-base
train
py
3d17d46694997327d65623caa458e09d948e2096
diff --git a/lib/cli/cli.js b/lib/cli/cli.js index <HASH>..<HASH> 100644 --- a/lib/cli/cli.js +++ b/lib/cli/cli.js @@ -206,6 +206,18 @@ module.exports.parseCommandLine = function parseCommandLine() { 'A URL that will be accessed first by the browser before the URL that you wanna analyze. Use it to fill the cache.', group: 'Browser' }) + .option('browsertime.preScript', { + alias: 'preScript', + describe: + 'Selenium script(s) to run before you test your URL. They will run outside of the analyze phase. Note that --preScript can be passed multiple times.', + group: 'Browser' + }) + .option('browsertime.postScript', { + alias: 'postScript', + describe: + 'Selenium script(s) to run after you test your URL. They will run outside of the analyze phase. Note that --postScript can be passed multiple times.', + group: 'Browser' + }) .option('browsertime.delay', { alias: 'delay', describe:
Adding back the pre/post script (#<I>)
sitespeedio_sitespeed.io
train
js
77d7e250187185bd1cb56ebb7a3820ef4e832df3
diff --git a/builtin/providers/consul/attr_writer_map.go b/builtin/providers/consul/attr_writer_map.go index <HASH>..<HASH> 100644 --- a/builtin/providers/consul/attr_writer_map.go +++ b/builtin/providers/consul/attr_writer_map.go @@ -3,7 +3,6 @@ package consul import ( "fmt" "strconv" - "strings" "github.com/hashicorp/terraform/helper/schema" ) @@ -49,18 +48,6 @@ func (w *_AttrWriterMap) SetFloat64(name _SchemaAttr, f float64) error { func (w *_AttrWriterMap) SetList(name _SchemaAttr, l []interface{}) error { panic(fmt.Sprintf("PROVIDER BUG: Cat set a list within a map for %s", name)) - out := make([]string, 0, len(l)) - for i, v := range l { - switch u := v.(type) { - case string: - out[i] = u - default: - panic(fmt.Sprintf("PROVIDER BUG: SetList type %T not supported (%#v)", v, v)) - } - } - - (*w.m)[string(name)] = strings.Join(out, ", ") - return nil } func (w *_AttrWriterMap) SetMap(name _SchemaAttr, m map[string]interface{}) error {
Remove stale code that would never be called at present.
hashicorp_terraform
train
go
dad547c59117a309e2c26869b7c58583f7ea4ad0
diff --git a/src/TerminalObject/Dynamic/Checkbox/Checkbox.php b/src/TerminalObject/Dynamic/Checkbox/Checkbox.php index <HASH>..<HASH> 100644 --- a/src/TerminalObject/Dynamic/Checkbox/Checkbox.php +++ b/src/TerminalObject/Dynamic/Checkbox/Checkbox.php @@ -174,6 +174,9 @@ class Checkbox protected function getPaddingString($line) { $length = $this->util->width() - $this->lengthWithoutTags($line); + if ($length < 1) { + return ''; + } return str_repeat(' ', $length); }
Don't try add padding if the there's no spare space
thephpleague_climate
train
php
232b8d0f622b80f8f81606eb68569c6f1f4e65a4
diff --git a/lib/acyclic.js b/lib/acyclic.js index <HASH>..<HASH> 100644 --- a/lib/acyclic.js +++ b/lib/acyclic.js @@ -1,7 +1,9 @@ +var util = require("./util"); + module.exports = acyclic; module.exports.undo = undo; -function acyclic(g, debugLevel) { +function acyclic(g) { var onStack = {}, visited = {}, reverseCount = 0; @@ -34,9 +36,8 @@ function acyclic(g, debugLevel) { g.eachNode(function(u) { dfs(u); }); - if (debugLevel >= 2) { - console.log("Acyclic Phase: reversed " + reverseCount + " edge(s)"); - } + util.log(2, "Acyclic Phase: reversed " + reverseCount + " edge(s)"); + return reverseCount; }
Use util.log for logging in acyclic phase
dagrejs_dagre
train
js
06410f33f37179ae38b8d9e1b54a80a5cd2d6f07
diff --git a/rows/utils/__init__.py b/rows/utils/__init__.py index <HASH>..<HASH> 100644 --- a/rows/utils/__init__.py +++ b/rows/utils/__init__.py @@ -394,6 +394,7 @@ def download_file( chunk_size=8192, sample_size=1048576, retries=3, + progress_pattern="Downloading file" ): # TODO: add ability to continue download @@ -422,15 +423,26 @@ def download_file( _, options = cgi.parse_header(headers["content-disposition"]) real_filename = options.get("filename", real_filename) - if progress: - total = response.headers.get("content-length", None) - total = int(total) if total else None - progress_bar = ProgressBar(prefix="Downloading file", total=total, unit="bytes") if filename is None: tmp = tempfile.NamedTemporaryFile(delete=False) fobj = open_compressed(tmp.name, mode="wb") else: fobj = open_compressed(filename, mode="wb") + + if progress: + total = response.headers.get("content-length", None) + total = int(total) if total else None + progress_bar = ProgressBar( + prefix=progress_pattern.format( + uri=uri, + filename=Path(fobj.name), + mime_type=mime_type, + encoding=encoding, + ), + total=total, + unit="bytes", + ) + sample_data = b"" for data in response.iter_content(chunk_size=chunk_size): fobj.write(data)
Add custom progress bar pattern to download_file
turicas_rows
train
py
52c6bf1aee4b71b8f5423dd807cf4a85ef4907ec
diff --git a/lib/cql/version.rb b/lib/cql/version.rb index <HASH>..<HASH> 100644 --- a/lib/cql/version.rb +++ b/lib/cql/version.rb @@ -1,4 +1,4 @@ module CQL # The current version of the gem - VERSION = '1.5.0' + VERSION = '1.5.1' end
Bump gem version Incrementing the version for the upcoming release.
enkessler_cql
train
rb
35841ee0a63178d941575e9445eaea4b4cea42af
diff --git a/nipap/nipap/nipapconfig.py b/nipap/nipap/nipapconfig.py index <HASH>..<HASH> 100644 --- a/nipap/nipap/nipapconfig.py +++ b/nipap/nipap/nipapconfig.py @@ -26,7 +26,7 @@ class NipapConfig(ConfigParser.SafeConfigParser): # First time - create new instance! self._cfg_path = cfg_path - ConfigParser.ConfigParser.__init__(self, default) + ConfigParser.SafeConfigParser.__init__(self, default) self.read_file()
backend: use SafeConfigParser nipapconfig uses SafeConfigParser as base class but used the __init__ function from the non-Safe parser. Let's go all Safe!
SpriteLink_NIPAP
train
py
90a31117269e5a3a81f54dfeca912f13ae717897
diff --git a/elasticsearch-model/test/test_helper.rb b/elasticsearch-model/test/test_helper.rb index <HASH>..<HASH> 100644 --- a/elasticsearch-model/test/test_helper.rb +++ b/elasticsearch-model/test/test_helper.rb @@ -30,7 +30,7 @@ module Elasticsearch class IntegrationTestCase < ::Test::Unit::TestCase extend Elasticsearch::Extensions::Test::StartupShutdown - startup { Elasticsearch::TestCluster.start if ENV['SERVER'] and not Elasticsearch::TestCluster.running? } + startup { Elasticsearch::Extensions::Test::Cluster.start if ENV['SERVER'] and not Elasticsearch::Extensions::Test::Cluster.running? } shutdown { Elasticsearch::Extensions::Test::Cluster.stop if ENV['SERVER'] && started? } context "IntegrationTest" do; should "noop on Ruby 1.8" do; end; end if RUBY_1_8
[MODEL] Correct launching of test server in test helper
elastic_elasticsearch-rails
train
rb
6ede36f8e08ebd20500a244f3be4b3ecb5a568b1
diff --git a/lib/Cake/Log/CakeLog.php b/lib/Cake/Log/CakeLog.php index <HASH>..<HASH> 100644 --- a/lib/Cake/Log/CakeLog.php +++ b/lib/Cake/Log/CakeLog.php @@ -19,39 +19,6 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -/** - * Set up error level constants to be used within the framework if they are not defined within the - * system. - * - */ -if (!defined('LOG_EMERG')) { - define('LOG_EMERG', 0); -} -if (!defined('LOG_ALERT')) { - define('LOG_ALERT', 1); -} -if (!defined('LOG_CRIT')) { - define('LOG_CRIT', 2); -} -if (!defined('LOG_ERR')) { - define('LOG_ERR', 3); -} -if (!defined('LOG_ERROR')) { - define('LOG_ERROR', LOG_ERR); -} -if (!defined('LOG_WARNING')) { - define('LOG_WARNING', 4); -} -if (!defined('LOG_NOTICE')) { - define('LOG_NOTICE', 5); -} -if (!defined('LOG_INFO')) { - define('LOG_INFO', 6); -} -if (!defined('LOG_DEBUG')) { - define('LOG_DEBUG', 7); -} - App::uses('LogEngineCollection', 'Log'); /**
removing unneeded LOG_* constant checks
cakephp_cakephp
train
php
66736af379427b86638a44431b142c4ec1ae2fac
diff --git a/db/migrate/20121102142657_create_task_manager_assignables.rb b/db/migrate/20121102142657_create_task_manager_assignables.rb index <HASH>..<HASH> 100644 --- a/db/migrate/20121102142657_create_task_manager_assignables.rb +++ b/db/migrate/20121102142657_create_task_manager_assignables.rb @@ -1,13 +1,13 @@ class CreateTaskManagerAssignables < ActiveRecord::Migration def change create_table :task_manager_assignables do |t| - t.belongs_to :plan + t.belongs_to :target, polymorphic: true t.belongs_to :assignee, polymorphic: true t.timestamps end add_index :task_manager_assignables, [:assignee_id, :assignee_type] - add_index :task_manager_assignables, :plan_id + add_index :task_manager_assignables, [:target_id, :target_type] end end
Assignable should have targets with different types
menglifang_task-manager
train
rb
3738876a57798e17eda8a252382ebd7ab568d2a1
diff --git a/pyblish_qml/rest.py b/pyblish_qml/rest.py index <HASH>..<HASH> 100644 --- a/pyblish_qml/rest.py +++ b/pyblish_qml/rest.py @@ -1,5 +1,4 @@ import json -from vendor import requests ADDRESS = "http://127.0.0.1:{port}/pyblish/v1{endpoint}" PORT = 6000 @@ -7,6 +6,7 @@ MOCK = None def request(verb, endpoint, data=None, **kwargs): + from vendor import requests endpoint = ADDRESS.format(port=PORT, endpoint=endpoint) request = getattr(MOCK or requests, verb.lower())
Deferring heavy import of requests library.
pyblish_pyblish-qml
train
py
b22549482785b58cd5064d9df4c481415f035bba
diff --git a/mux_command.go b/mux_command.go index <HASH>..<HASH> 100644 --- a/mux_command.go +++ b/mux_command.go @@ -132,8 +132,7 @@ func (m *CommandMux) HandleEvent(c *Client, e *Event) { } // Copy it into a new Event - newEvent := &Event{} - *newEvent = *e + newEvent := e.Copy() // Chop off the command itself msgParts := strings.SplitN(lastArg, " ", 2) diff --git a/mux_mention.go b/mux_mention.go index <HASH>..<HASH> 100644 --- a/mux_mention.go +++ b/mux_mention.go @@ -53,8 +53,7 @@ func (m *MentionMux) HandleEvent(c *Client, e *Event) { } // Copy it into a new Event - newEvent := &Event{} - *newEvent = *e + newEvent := e.Copy() // Strip the nick, punctuation, and spaces from the message newEvent.Args[len(newEvent.Args)-1] = strings.TrimSpace(lastArg[len(nick)+1:])
Use Event.Copy() in the new muxes
go-irc_irc
train
go,go
f6c89008619a84698b179a6d048bf77e28ccc5b1
diff --git a/app/js/lib/conf/routes.js b/app/js/lib/conf/routes.js index <HASH>..<HASH> 100644 --- a/app/js/lib/conf/routes.js +++ b/app/js/lib/conf/routes.js @@ -170,8 +170,8 @@ module.exports = (app) => { state('main.settings.currency', { url: '/currency', resolve: { - conf: (bmapi) => co(function *() { - return bmapi.currency.parameters(); + conf: (summary) => co(function *() { + return summary.parameters; }) }, template: require('views/main/settings/tabs/currency'),
Fix: Settings > Currency should display even with a down server
duniter_duniter-ui
train
js
efe905a8aeee9945f431a3b6f527dd5a6a7b3e48
diff --git a/lib/reading_view.js b/lib/reading_view.js index <HASH>..<HASH> 100644 --- a/lib/reading_view.js +++ b/lib/reading_view.js @@ -16,8 +16,9 @@ exports.convert = function (url, params, cb) { self.articleSelector = params.articleQuery || 'article'; self.tagsToInclude = (is.array(params.tagQueries) && params.tagQueries.lenght > 0) ? params.tagQueries : ['p','img']; self.title = { - textOnly: params.title.textOnly || true, - query: params.title.query || (function () { + textOnly: params.title.textOnly || true, + tagToWrap: params.title.tagToWrap || 'h2', + query: params.title.query || (function () { let resStr = []; for(let i = 1; i < 7; i++) { resStr.push(`${self.articleSelector} h${i}:first`); @@ -54,7 +55,7 @@ exports.convert = function (url, params, cb) { res = "", title = (function () { let element = $(self.title.query).first(); - return (self.title.textOnly ? $('h2').html(element.text()) : element)[0].outerHTML; + return (self.title.textOnly ? $(self.title.tagToWrap).html(element.text()) : element)[0].outerHTML; }()) res += title;
Added tag to wrap for title that binds only text
Artie18_reading_view
train
js
68c7fc63cfec6675d54cef80cac964b1e4f7799d
diff --git a/sprinter/formulas/package.py b/sprinter/formulas/package.py index <HASH>..<HASH> 100644 --- a/sprinter/formulas/package.py +++ b/sprinter/formulas/package.py @@ -23,8 +23,11 @@ class PackageFormula(FormulaStandard): super(PackageFormula, self).setup(feature_name, config) def update(self, feature_name, source_config, target_config): - if 'formula' not in source_config or \ - source_config['formula'] != target_config['formula']: + install_package = ('formula' not in source_config + or (source_config['formula'] != target_config['formula']) + or (self.package_manager in target_config and self.package_manager not in source_config) + or (target_config[self.package_manager] != source_config[self.package_manager])) + if install_package: self.__install_package(feature_name, target_config) super(PackageFormula, self).update(feature_name, source_config, target_config)
Fixing bug with different package not install on update
toumorokoshi_sprinter
train
py
bec015920b7d398fe965cf2a42c1a45f98b1ed23
diff --git a/smore/apispec/core.py b/smore/apispec/core.py index <HASH>..<HASH> 100644 --- a/smore/apispec/core.py +++ b/smore/apispec/core.py @@ -18,6 +18,8 @@ class APISpec(object): ret = {} if properties: ret['properties'] = properties + for func in self._definition_helpers: + ret.update(func(name, **kwargs)) ret.update(kwargs) self._definitions[name] = ret diff --git a/tests/test_api_spec.py b/tests/test_api_spec.py index <HASH>..<HASH> 100644 --- a/tests/test_api_spec.py +++ b/tests/test_api_spec.py @@ -64,3 +64,16 @@ class TestExtensions: pass spec.register_definition_helper(my_definition_helper) assert my_definition_helper in spec._definition_helpers + + +class TestDefinitionHelpers: + + def test_definition_helpers_are_used(self, spec): + properties = {'properties': {'name': {'type': 'string'}}} + + def definition_helper(name, **kwargs): + return properties + spec.register_definition_helper(definition_helper) + spec.definition('Pet', {}) + assert spec._definitions['Pet'] == properties +
Use definition helpers in APISpec#definition
marshmallow-code_apispec
train
py,py
d5713d96e14bb3f820db46e191a60e0163b2b1bf
diff --git a/presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/TransformCorrelatedScalarAggregationToJoin.java b/presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/TransformCorrelatedScalarAggregationToJoin.java index <HASH>..<HASH> 100644 --- a/presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/TransformCorrelatedScalarAggregationToJoin.java +++ b/presto-main/src/main/java/com/facebook/presto/sql/planner/iterative/rule/TransformCorrelatedScalarAggregationToJoin.java @@ -85,7 +85,7 @@ public class TransformCorrelatedScalarAggregationToJoin @Override public Optional<PlanNode> apply(LateralJoinNode lateralJoinNode, Captures captures, Context context) { - PlanNode subquery = context.getLookup().resolve(lateralJoinNode.getSubquery()); + PlanNode subquery = lateralJoinNode.getSubquery(); if (!isScalar(subquery, context.getLookup())) { return Optional.empty();
Remove unnessasary Lookup::resolve usage
prestodb_presto
train
java
92e61f6f56859caa7c03503a1d704557f826eea2
diff --git a/modules/cms/menu/Container.php b/modules/cms/menu/Container.php index <HASH>..<HASH> 100644 --- a/modules/cms/menu/Container.php +++ b/modules/cms/menu/Container.php @@ -5,6 +5,7 @@ namespace cms\menu; use Yii; use Exception; use ArrayAccess; +use yii\web\NotFoundHttpException; use yii\db\Query as DbQuery; use cms\menu\Query as MenuQuery; @@ -375,15 +376,12 @@ class Container extends \yii\base\Component implements ArrayAccess } } - if (!$item) { - $this->_currentAppendix = $requestPath; - - return $this->home; + if ($item) { + $this->_currentAppendix = substr($requestPath, strlen($item->alias) + 1); + return $item; } - $this->_currentAppendix = substr($requestPath, strlen($item->alias) + 1); - - return $item; + throw new NotFoundHttpException("Unable to resolve requested path '".$requestPath."'."); } /**
fixed where not found rules will not be resolved by current menu item.
luyadev_luya
train
php
f1782f8ffffe53926fb2e5b283f132a701844fb1
diff --git a/lib/phusion_passenger/common_library.rb b/lib/phusion_passenger/common_library.rb index <HASH>..<HASH> 100644 --- a/lib/phusion_passenger/common_library.rb +++ b/lib/phusion_passenger/common_library.rb @@ -102,7 +102,7 @@ class CommonLibraryBuilder def define_tasks(extra_compiler_flags = nil) flags = "-Iext -Iext/common #{LIBEV_CFLAGS} #{extra_compiler_flags} " - flags << "#{PlatformInfo.portability_cflags} #{EXTRA_CXXFLAGS}" + flags << "#{PlatformInfo.portability_cxxflags} #{EXTRA_CXXFLAGS}" flags.strip! group_all_components_by_category.each_pair do |category, object_names|
Compile the common library with portability_cxxflags instead of portability_cflags
phusion_passenger
train
rb
c8833f0d60ba5a885a5122898ba6ed60f4aac88e
diff --git a/packages/cozy-konnector-libs/src/libs/cozyclient.js b/packages/cozy-konnector-libs/src/libs/cozyclient.js index <HASH>..<HASH> 100644 --- a/packages/cozy-konnector-libs/src/libs/cozyclient.js +++ b/packages/cozy-konnector-libs/src/libs/cozyclient.js @@ -67,8 +67,8 @@ const getCozyClient = function(environment = 'production') { const cozyFields = JSON.parse(process.env.COZY_FIELDS || '{}') cozyClient.new = new NewCozyClient({ - uri: cozyClient._uri, - token: cozyClient._token, + uri: cozyURL, + token: credentials.token.accessToken, appMetadata: { slug: manifest.data.slug, sourceAccount: cozyFields.account,
fix: initalization of new cozy-client instance
konnectors_libs
train
js
5c18a0a47687992002e7046a37ef22d15affd18f
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index <HASH>..<HASH> 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -4,6 +4,7 @@ namespace Algolia\SearchBundle\DependencyInjection; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; +use function method_exists; /** * This is the class that validates and merges configuration from your app/config files. @@ -17,8 +18,13 @@ class Configuration implements ConfigurationInterface */ public function getConfigTreeBuilder() { - $treeBuilder = new TreeBuilder(); - $rootNode = $treeBuilder->root('algolia_search'); + if (method_exists(TreeBuilder::class, 'getRootNode')) { + $treeBuilder = new TreeBuilder('algolia_search'); + $rootNode = $treeBuilder->getRootNode(); + } else { + $treeBuilder = new TreeBuilder(); + $rootNode = $treeBuilder->root('algolia_search'); + } $rootNode ->children()
Fix deprecation for tree builders without root node
algolia_search-bundle
train
php
3cc4cdd3631ac3d2d769e5742234461fe8116f9d
diff --git a/pkg/transport/timeout_dialer_test.go b/pkg/transport/timeout_dialer_test.go index <HASH>..<HASH> 100644 --- a/pkg/transport/timeout_dialer_test.go +++ b/pkg/transport/timeout_dialer_test.go @@ -43,7 +43,7 @@ func TestReadWriteTimeoutDialer(t *testing.T) { defer conn.Close() // fill the socket buffer - data := make([]byte, 1024*1024) + data := make([]byte, 5*1024*1024) timer := time.AfterFunc(d.wtimeoutd*5, func() { t.Fatal("wait timeout") }) diff --git a/pkg/transport/timeout_listener_test.go b/pkg/transport/timeout_listener_test.go index <HASH>..<HASH> 100644 --- a/pkg/transport/timeout_listener_test.go +++ b/pkg/transport/timeout_listener_test.go @@ -52,7 +52,7 @@ func TestWriteReadTimeoutListener(t *testing.T) { defer conn.Close() // fill the socket buffer - data := make([]byte, 1024*1024) + data := make([]byte, 5*1024*1024) timer := time.AfterFunc(wln.wtimeoutd*5, func() { t.Fatal("wait timeout") })
pkg/transport: change write size from 1MB -> 5MB As we move to container-based infrastructure testing env on travis, the tcp write buffer is more than 1MB. Change the test according to the change on the testing env.
etcd-io_etcd
train
go,go
7511d5a30e6647f07734f65666dc49a078cc5802
diff --git a/src/matches.js b/src/matches.js index <HASH>..<HASH> 100644 --- a/src/matches.js +++ b/src/matches.js @@ -21,7 +21,7 @@ function type(object, fragment) { } function id(object, fragment) { - return (object.props.id == fragment); + return (object.props.id == fragment.slice(1)); } export default {
Fixed a bug where selecting by ID wouldn't work. - This was because the hash wasn't slice when comparing the fragment.
lewie9021_react-shallow-query
train
js
096485f4fc046809c1486f6d01f13ac28bf9ec8d
diff --git a/Repo/Data/Downline/Qualification.php b/Repo/Data/Downline/Qualification.php index <HASH>..<HASH> 100644 --- a/Repo/Data/Downline/Qualification.php +++ b/Repo/Data/Downline/Qualification.php @@ -9,6 +9,8 @@ namespace Praxigento\BonusHybrid\Repo\Data\Downline; * Customer qualification data for downline trees. * * TODO: do we really need this entity? See \Praxigento\BonusHybrid\Repo\Data\Downline::A_RANK_REF + * All customers have DISTRIBUTOR rank in "Downline" table, even w/o qualification but only qualified distributors + * have record in "Qualification" table. */ class Qualification extends \Praxigento\Core\App\Repo\Data\Entity\Base
MOBI-<I> Complete bonus overview report
praxigento_mobi_mod_bonus_hybrid
train
php
492da55af08224160d0e652cbba0ff9444c346a9
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -13,17 +13,22 @@ kwargs = {'name': 'Glymur', 'package_data': {'glymur': ['data/*.jp2', 'data/*.j2k']}, 'scripts': ['bin/jp2dump'], 'license': 'LICENSE.txt', + 'test_suite': 'glymur.test', 'platforms': ['darwin']} instllrqrs = ['numpy>1.6.2'] if sys.hexversion < 0x03030000: instllrqrs.append('contextlib2>=0.4') - instllrqrs.append('mock>=1.0.1') if sys.hexversion < 0x02070000: instllrqrs.append('ordereddict>=1.1') instllrqrs.append('unittest2>=0.5.1') kwargs['install_requires'] = instllrqrs +testrqrs = ['matplotlib>=1.1.0', 'Pillow>=2.0.0'] +if sys.hexversion < 0x03030000: + testrqrs.append('mock>=1.0.1') +kwargs['tests_require'] = testrqrs + clssfrs = ["Programming Language :: Python", "Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.7",
Moving test requirements into its own area. Worked on Fedora<I>, python <I>. #<I>
quintusdias_glymur
train
py
6531b63cbcbcfc070115c5a70b23e0f7b028d831
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,14 @@ from setuptools import setup import rtv -DESCRIPTION = 'RTV podcast downloader' -LONG_DESCRIPTION = 'Command-line program to download podcasts from various sites.' +DESCRIPTION = 'RTV downloader' +LONG_DESCRIPTION = 'Command-line program to download videos from various sites.' setup(name='rtv', version=rtv.__version__, description=DESCRIPTION, long_description=LONG_DESCRIPTION, - url='https://github.com/radzak/RtvDownloader', + url='https://github.com/radzak/RTVdownloader', author='Radek Krzak', author_email='radek.krzak@gmail.com', license='MIT', @@ -23,7 +23,8 @@ setup(name='rtv', 'Js2Py', 'youtube_dl', 'validators', - 'beautifulsoup4' + 'beautifulsoup4', + 'tldextract' ], setup_requires=['pytest-runner'], tests_require=['pytest'],
Refactor setup.py + add tldextract to required packages
radzak_rtv-downloader
train
py
ee89a763906bb2903523e09b53727cca3ef09ffc
diff --git a/src/module.js b/src/module.js index <HASH>..<HASH> 100644 --- a/src/module.js +++ b/src/module.js @@ -84,9 +84,8 @@ } } // Maybe failed to fetch successfully, such as 404 or non-module. - // // In these cases, module.status stay at FETCHING or FETCHED. + // In these cases, just call cb function directly. else { - util.log('It is not a valid CMD module: ' + uri) cb() } }
Remove "It is not valid CMD module" log info. close #<I>
seajs_seajs
train
js
0af6b56e3b7d2d3bb6037d5ad21c197bb68c4653
diff --git a/packages/cozy-scripts/template/app/jest.config.js b/packages/cozy-scripts/template/app/jest.config.js index <HASH>..<HASH> 100644 --- a/packages/cozy-scripts/template/app/jest.config.js +++ b/packages/cozy-scripts/template/app/jest.config.js @@ -9,6 +9,10 @@ module.exports = { '\\.(css|styl)$': 'identity-obj-proxy' }, transformIgnorePatterns: ['node_modules/(?!cozy-ui)'], + transform: { + // babel-jest module is installed by cozy-scripts + '^.+\\.jsx?$': 'babel-jest' + }, globals: { __ALLOW_HTTP__: false, __TARGET__: 'browser',
fix: :nail_care: Force using babel-jest for react app
CPatchane_create-cozy-app
train
js
de9e30c24dcad5fc8e6b1879a9b75020b1731434
diff --git a/Command/JordiLlonchCrudCommand.php b/Command/JordiLlonchCrudCommand.php index <HASH>..<HASH> 100644 --- a/Command/JordiLlonchCrudCommand.php +++ b/Command/JordiLlonchCrudCommand.php @@ -17,7 +17,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Sensio\Bundle\GeneratorBundle\Command\GenerateDoctrineCrudCommand; use JordiLlonch\Bundle\CrudGeneratorBundle\Generator\JordiLlonchCrudGenerator; -use Symfony\Component\HttpKernel\Bundle\Bundle; class JordiLlonchCrudCommand extends GenerateDoctrineCrudCommand {
Fixes from SensioLabsInsight
jordillonch_CrudGeneratorBundle
train
php
9bba22d6d1dadc5b47364f0a5f305851dff6e4c1
diff --git a/src/Plugin.php b/src/Plugin.php index <HASH>..<HASH> 100644 --- a/src/Plugin.php +++ b/src/Plugin.php @@ -234,6 +234,10 @@ class Plugin implements PluginInterface, EventSubscriberInterface $path = substr($path, 1); } + if (strncmp($path, '$', 1) === 0) { + $path = Builder::path(substr($path, 1)); + } + if (!$this->getFilesystem()->isAbsolutePath($path)) { $prefix = $package instanceof RootPackageInterface ? $this->getBaseDir()
added `$config` paths to include built configs
hiqdev_composer-config-plugin
train
php
7bba78a70e8775469a1f34f60323b4f067cc236e
diff --git a/src/Http/Controllers/PageController.php b/src/Http/Controllers/PageController.php index <HASH>..<HASH> 100644 --- a/src/Http/Controllers/PageController.php +++ b/src/Http/Controllers/PageController.php @@ -14,6 +14,23 @@ class PageController extends \Pvtl\VoyagerPages\Http\Controllers\PageController protected $viewPath = 'voyager-frontend::modules.pages.default'; /** + * Add the layout to the returned page + * + * @param string $slug + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function getPage($slug = 'home') + { + $view = parent::getPage($slug); + $page = Page::findOrFail((int)$view->page->id); + + $view->layout = $page->layout; + + return $view; + } + + /** * POST B(R)EAD - Read data. * * @param \Illuminate\Http\Request $request
Extend pages to add layout to page view
pvtl_voyager-frontend
train
php
1b12f09cbc78f2e1ad753e5903213602c6b5007e
diff --git a/lib/giantbomb.rb b/lib/giantbomb.rb index <HASH>..<HASH> 100644 --- a/lib/giantbomb.rb +++ b/lib/giantbomb.rb @@ -10,5 +10,5 @@ end end module GiantBomb - VERSION = "0.1.0" + VERSION = "0.5.0" end \ No newline at end of file
bumped version to <I>
games-directory_api-giantbomb
train
rb
3b94470f3cdb19c22e5363624f4157de8c7d5d2b
diff --git a/controller/extjs/tests/TestHelper.php b/controller/extjs/tests/TestHelper.php index <HASH>..<HASH> 100644 --- a/controller/extjs/tests/TestHelper.php +++ b/controller/extjs/tests/TestHelper.php @@ -50,6 +50,9 @@ class TestHelper } + /** + * @param string $site + */ private static function _createContext( $site ) { $ctx = new MShop_Context_Item_Default(); diff --git a/lib/custom/tests/TestHelper.php b/lib/custom/tests/TestHelper.php index <HASH>..<HASH> 100644 --- a/lib/custom/tests/TestHelper.php +++ b/lib/custom/tests/TestHelper.php @@ -47,6 +47,9 @@ class TestHelper } + /** + * @param string $site + */ private static function _createContext( $site ) { $ds = DIRECTORY_SEPARATOR;
Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on <URL>
aimeos_ai-container
train
php,php
91901a095ae967649486457220aed674c361d5f0
diff --git a/lib/hash/hash_path_processors.rb b/lib/hash/hash_path_processors.rb index <HASH>..<HASH> 100644 --- a/lib/hash/hash_path_processors.rb +++ b/lib/hash/hash_path_processors.rb @@ -101,8 +101,7 @@ module BBLib end def self.parse_date(child, *args, class_based: true) - params = BBLib.named_args(args) - format = params.include?(:format) ? params[:format] : '%Y-%m-%d %H:%M:%S' + format = BBLib.named_args(*args)[:format] child.replace_with( if class_based && child.node_class == Hash child.value.map do |k, v| @@ -122,7 +121,8 @@ module BBLib formatted = nil patterns.each do |pattern| next unless formatted.nil? - formatted = Time.strptime(value.to_s, pattern.to_s).strftime(format) rescue nil + formatted = Time.strptime(value.to_s, pattern.to_s) rescue nil + formatted = formatted.strftime(format) if format end formatted end
Changed date parsing to return a time object if a format is not passed.
bblack16_bblib-ruby
train
rb
555c06bcca0cf5a9d4b7fca7a5cd2045d27f5964
diff --git a/lib/lazy_resource/request.rb b/lib/lazy_resource/request.rb index <HASH>..<HASH> 100644 --- a/lib/lazy_resource/request.rb +++ b/lib/lazy_resource/request.rb @@ -29,7 +29,7 @@ module LazyResource end def log_response(response) - LazyResource.logger.info "\t[#{response.code}](#{(response.time.to_i * 1000).ceil}ms): #{self.url}" + LazyResource.logger.info "\t[#{response.code}](#{((response.time || 0) * 1000).ceil}ms): #{self.url}" end def parse
Using to_i just wiped out the response time.
ahlatimer_lazy_resource
train
rb
39666bec594f0096b58a344f4380e11dda891b2f
diff --git a/grab/base.py b/grab/base.py index <HASH>..<HASH> 100644 --- a/grab/base.py +++ b/grab/base.py @@ -458,7 +458,7 @@ class Grab(LXMLExtension, FormExtension, PyqueryExtension, #raise IOError('Response code is %s: ' % self.response_code) if self.config['log_file']: - with open(self.config['log_file'], 'w') as out: + with open(self.config['log_file'], 'wb') as out: out.write(self.response.body)
Change file open mode in log_file option
lorien_grab
train
py
5b7791275ed87d1cdd56a35ba496a9e058423e25
diff --git a/calculation-engine/engine-evaluation/src/main/java/com/dataart/spreadsheetanalytics/engine/graph/PoiExecutionGraphBuilder.java b/calculation-engine/engine-evaluation/src/main/java/com/dataart/spreadsheetanalytics/engine/graph/PoiExecutionGraphBuilder.java index <HASH>..<HASH> 100644 --- a/calculation-engine/engine-evaluation/src/main/java/com/dataart/spreadsheetanalytics/engine/graph/PoiExecutionGraphBuilder.java +++ b/calculation-engine/engine-evaluation/src/main/java/com/dataart/spreadsheetanalytics/engine/graph/PoiExecutionGraphBuilder.java @@ -309,8 +309,6 @@ public class PoiExecutionGraphBuilder implements IExecutionGraphBuilder { ExecutionGraphVertex ivertex = state.dgraph.getEdgeSource(edge); buildFormula(ivertex, state); } - vertex.formula.formulaPtgStr(""); - vertex.formula.ptgStr(""); return CellFormulaExpression.copyOf(vertex.formula); } case RANGE: {
PTG strings are built in POI
DataArt_CalculationEngine
train
java
4446e8940553490c9235244dff206829e0e44bdf
diff --git a/firetv/__main__.py b/firetv/__main__.py index <HASH>..<HASH> 100644 --- a/firetv/__main__.py +++ b/firetv/__main__.py @@ -29,7 +29,7 @@ app = Flask(__name__) devices = {} config_data = None valid_device_id = re.compile('^[-\w]+$') -valid_app_id = re.compile('^[a-zA-Z][a-z\.A-Z]+$') +valid_app_id = re.compile('^[A-Za-z0-9\.]+$') def is_valid_host(host):
update valid_app_id regex Update to allow app/package names with numbers.
happyleavesaoc_python-firetv
train
py
a3cfd327789031862b99611fafafae4bcbed2ecb
diff --git a/internal/services/automation/automation_account_data_source.go b/internal/services/automation/automation_account_data_source.go index <HASH>..<HASH> 100644 --- a/internal/services/automation/automation_account_data_source.go +++ b/internal/services/automation/automation_account_data_source.go @@ -68,8 +68,10 @@ func dataSourceAutomationAccountRead(d *pluginsdk.ResourceData, meta interface{} } return fmt.Errorf("retreiving Automation Account Registration Information %s: %+v", id, err) } - d.Set("primary_key", iresp.Keys.Primary) - d.Set("secondary_key", iresp.Keys.Secondary) + if iresp.Keys != nil { + d.Set("primary_key", iresp.Keys.Primary) + d.Set("secondary_key", iresp.Keys.Secondary) + } d.Set("endpoint", iresp.Endpoint) return nil }
fix #<I> by adding nil check
terraform-providers_terraform-provider-azurerm
train
go
bfd4fac0edd82590bbd3e550c5f7dd8b2a042c89
diff --git a/vaex/test/dataset.py b/vaex/test/dataset.py index <HASH>..<HASH> 100644 --- a/vaex/test/dataset.py +++ b/vaex/test/dataset.py @@ -1399,8 +1399,8 @@ class TestDataset(unittest.TestCase): path_fits_astropy = tempfile.mktemp(".fits") #print path - with self.assertRaises(AssertionError): - self.dataset.export_hdf5(path, selection=True) + #with self.assertRaises(AssertionError): + # self.dataset.export_hdf5(path, selection=True) for dataset in [self.dataset_concat_dup, self.dataset]: #print dataset.virtual_columns
fix: we don't check for selections anymore in export, test reflects that now
vaexio_vaex
train
py
efa416c0f1dffb467cd81c66d5763225af6182c6
diff --git a/src/Routing/Conditions/Url.php b/src/Routing/Conditions/Url.php index <HASH>..<HASH> 100644 --- a/src/Routing/Conditions/Url.php +++ b/src/Routing/Conditions/Url.php @@ -145,8 +145,8 @@ class Url implements ConditionInterface { // add a question mark to the end to make the trailing slash optional $validation_regex = $validation_regex . '?'; - // make sure the regex matches the beginning of the url - $validation_regex = '^' . $validation_regex; + // make sure the regex matches the entire url + $validation_regex = '^' . $validation_regex . '$'; if ( $wrap ) { $validation_regex = '~' . $validation_regex . '~';
fix Url condition matching just the start of the path instead of the whole path
htmlburger_wpemerge
train
php
5df40097580bf59f046e7de8921828b1a1516ef6
diff --git a/lib/passbook.rb b/lib/passbook.rb index <HASH>..<HASH> 100644 --- a/lib/passbook.rb +++ b/lib/passbook.rb @@ -3,7 +3,7 @@ require "passbook/pkpass" require "passbook/signer" require 'active_support/core_ext/module/attribute_accessors' require 'passbook/push_notification' -require 'grocer/passbook_notification' +require 'grocer' require 'rack/passbook_rack' module Passbook 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,7 +2,7 @@ require 'rubygems' require 'bundler' require 'json' require 'simplecov' -require 'grocer/passbook_notification' +require 'grocer' SimpleCov.start Dir['lib/passbook/**/*.rb'].each {|f| require File.join(File.dirname(__FILE__), '..', f.gsub(/.rb/, ''))}
require whole "grocer" gem otherwise you won't load "lib/grocer.rb" and you'll see "NoMethodError (undefined method `pusher' for Grocer:Module):" error.
frozon_passbook
train
rb,rb
1130d27a414561aeedfbf6c9ccf1128133e4f26b
diff --git a/src/ORM/Table.php b/src/ORM/Table.php index <HASH>..<HASH> 100644 --- a/src/ORM/Table.php +++ b/src/ORM/Table.php @@ -1213,7 +1213,7 @@ class Table implements RepositoryInterface, EventListenerInterface, EventDispatc * called allowing you to define additional default values. The new * entity will be saved and returned. * - * @param array|\Cake\ORM\Query|string $search The criteria to find existing records by. + * @param array|\Cake\ORM\Query $search The criteria to find existing records by. * @param callable|null $callback A callback that will be invoked for newly * created entities. This callback will be called *before* the entity * is persisted.
Updating the doc block for findOrCreate
cakephp_cakephp
train
php