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
f940c3df9c8903ab14002ced05ec5d456c00cf38
diff --git a/lib/nexpose/api_request.rb b/lib/nexpose/api_request.rb index <HASH>..<HASH> 100644 --- a/lib/nexpose/api_request.rb +++ b/lib/nexpose/api_request.rb @@ -47,6 +47,7 @@ module Nexpose end def execute(options = {}) + time_tracker = Time.now @conn_tries = 0 begin prepare_http_client @@ -111,12 +112,16 @@ module Nexpose retry end rescue ::Timeout::Error + $stdout.puts @http.read_timeout if @conn_tries < 5 @conn_tries += 1 - # If an explicit timeout is set, don't retry. - retry unless options.key? :timeout + if options.key?(:timeout) + retry if (time_tracker + options[:timeout].to_i) > Time.now + else + retry + end end - @error = "Nexpose did not respond within #{@http.read_timeout} seconds after #{@conn_tries} attempts." + @error = "Nexpose did not respond within #{@http.read_timeout} seconds after #{@conn_tries} attempt(s)." rescue ::Errno::EHOSTUNREACH, ::Errno::ENETDOWN, ::Errno::ENETUNREACH, ::Errno::ENETRESET, ::Errno::EHOSTDOWN, ::Errno::EACCES, ::Errno::EINVAL, ::Errno::EADDRNOTAVAIL @error = 'Nexpose host is unreachable.' # Handle console-level interrupts
attempt retry based on timeout
rapid7_nexpose-client
train
rb
addf48972965b5ebc5166f8a4552c17820c26585
diff --git a/wsfexv1.py b/wsfexv1.py index <HASH>..<HASH> 100644 --- a/wsfexv1.py +++ b/wsfexv1.py @@ -834,7 +834,7 @@ if __name__ == "__main__": else: wsdl = "https://wswhomo.afip.gov.ar/wsfexv1/service.asmx?WSDL" cache = proxy = "" - wrapper = "" + wrapper = "httplib2" cacert = "conf/afip_ca_info.crt" ok = wsfexv1.Conectar(cache, wsdl, proxy, wrapper, cacert)
reverting minor change in wsfexv1.py
reingart_pyafipws
train
py
fd0ca898307be2ec678bd0cc6b4579436c5e45a7
diff --git a/Upstart.php b/Upstart.php index <HASH>..<HASH> 100644 --- a/Upstart.php +++ b/Upstart.php @@ -5,6 +5,7 @@ namespace Modulus\Framework; use App\Resolvers\AppServiceResolver; use Modulus\Framework\Upstart\AppLogger; use Modulus\Framework\Upstart\AppConnect; +use Modulus\Framework\Upstart\HandleCors; use Modulus\Framework\Upstart\ErrorReport; use Modulus\Framework\Upstart\SwishRouter; use Modulus\Framework\Mocks\MustRememberMe; @@ -15,6 +16,7 @@ class Upstart { use AppLogger; // Configure application logger use AppConnect; // Initialize Database connection and Environment variables + use HandleCors; // Allow other applications to reach the router dispatch use SwishRouter; // Handle application routing use ErrorReport; // Handle application error reporting use ViewComponent; // Strap application View @@ -42,6 +44,7 @@ class Upstart */ public function boot(?bool $isConsole = false) : void { + $this->addCors(); if (Upstart::$isReady) return; $this->bootEnv();
Feat: execute addCors on boot
modulusphp_framework
train
php
859b8845889d1e6f9293f4f870d1c0be0b478ef2
diff --git a/datalab/data/commands/_sql.py b/datalab/data/commands/_sql.py index <HASH>..<HASH> 100644 --- a/datalab/data/commands/_sql.py +++ b/datalab/data/commands/_sql.py @@ -89,7 +89,7 @@ _sql_parser = _create_sql_parser() # Register the line magic as well as the cell magic so we can at least give people help # without requiring them to enter cell content first. @IPython.core.magic.register_line_cell_magic -def sql(line, cell): +def sql(line, cell=None): """ Create a SQL module with one or more queries. Use %sql --help for more details. The supported syntax is:
Resolve issue where `%%sql --help` raises exception #<I>
googledatalab_pydatalab
train
py
22a5e1b6e24e032ae695790bdf9428f6add82c20
diff --git a/fireplace/card.py b/fireplace/card.py index <HASH>..<HASH> 100644 --- a/fireplace/card.py +++ b/fireplace/card.py @@ -646,7 +646,7 @@ class Enchantment(BaseCard): def _set_zone(self, zone): if zone == Zone.PLAY: self.owner.buffs.append(self) - elif zone == Zone.GRAVEYARD: + elif zone == Zone.REMOVEDFROMGAME: self.owner.buffs.remove(self) super()._set_zone(zone) @@ -664,7 +664,7 @@ class Enchantment(BaseCard): logging.info("Destroying buff %r from %r" % (self, self.owner)) if hasattr(self.data.scripts, "destroy"): self.data.scripts.destroy(self) - self.zone = Zone.GRAVEYARD + self.zone = Zone.REMOVEDFROMGAME if self.aura_source: # Clean up the buff from its source auras self.aura_source._buffs.remove(self)
Move destroyed buffs to REMOVEDFROMGAME instead of GRAVEYARD
jleclanche_fireplace
train
py
8917e793c34fc2ca94378dbeb337100774709fc9
diff --git a/src/main/java/org/komamitsu/fluency/sender/TCPSender.java b/src/main/java/org/komamitsu/fluency/sender/TCPSender.java index <HASH>..<HASH> 100644 --- a/src/main/java/org/komamitsu/fluency/sender/TCPSender.java +++ b/src/main/java/org/komamitsu/fluency/sender/TCPSender.java @@ -152,6 +152,27 @@ public class TCPSender { SocketChannel socketChannel; if ((socketChannel = channel.getAndSet(null)) != null) { + socketChannel.socket().shutdownOutput(); + + int i; + int maxWait = 10; + for (i = 0; i < maxWait; i++) { + if (socketChannel.socket().isInputShutdown()) { + break; + } + try { + TimeUnit.MILLISECONDS.sleep(200); + } + catch (InterruptedException e) { + LOG.warn("Interrupted", e); + Thread.currentThread().interrupt(); + break; + } + } + if (i >= maxWait) { + LOG.warn("This socket wasn't closed from the receiver side in an expected time"); + } + socketChannel.close(); channel.set(null); }
Shutdown (SHUT_WR) and wait until output is closed in TCPSender#close instead of just closing the socket
komamitsu_fluency
train
java
76bc2cfffa406d5162678e99f9463cbf18d5200c
diff --git a/mod/assignment/lib.php b/mod/assignment/lib.php index <HASH>..<HASH> 100644 --- a/mod/assignment/lib.php +++ b/mod/assignment/lib.php @@ -3129,14 +3129,14 @@ class assignment_portfolio_caller extends portfolio_module_caller_base { print_error('invalidcoursemodule'); } - if (! $assignment = $DB->get_record("assignment", array("id"=>$cm->instance))) { + if (! $assignment = $DB->get_record("assignment", array("id"=>$this->cm->instance))) { print_error('invalidid', 'assignment'); } $this->assignmentfile = $CFG->dirroot . '/mod/assignment/type/' . $assignment->assignmenttype . '/assignment.class.php'; require_once($this->assignmentfile); $assignmentclass = "assignment_$assignment->assignmenttype"; - $this->assignment= new $assignmentclass($cm->id, $assignment, $cm); + $this->assignment= new $assignmentclass($this->cm->id, $assignment, $this->cm); if (!$this->assignment->portfolio_exportable()) { print_error('notexportable', 'portfolio', $this->get_return_url()); }
MDL-<I> - fixing bugs I introduced in a refactor in assignment
moodle_moodle
train
php
3c572c0cddf07ed1190b9dc41169747ee3fa8e7d
diff --git a/tests/test_mapper.py b/tests/test_mapper.py index <HASH>..<HASH> 100644 --- a/tests/test_mapper.py +++ b/tests/test_mapper.py @@ -16,7 +16,7 @@ class MapTest(unittest.TestCase): def setUp(self): """ gets called for EACH test """ unittest.TestCase.setUp(self) - self.mymap = mod_map.Mapper() + self.mymap = mod_map.Mapper(mod_map.map_file) def tearDown(self): @@ -58,7 +58,7 @@ class MapTest(unittest.TestCase): def test_31_MapColumn(self): mc = mod_map.MapColumn('table,column,data_type,aikif_map,aikif_map_name,extract,format,where,index,') - print(mc) + #print(mc) self.assertEqual(mc.table, 'table') self.assertEqual(mc.column, 'column') self.assertEqual(mc.data_type, 'data_type') @@ -71,10 +71,10 @@ class MapTest(unittest.TestCase): def test_90_get_maps_stats(self): - mc = mod_map.Mapper() - print(mc) + mc = mod_map.Mapper(mod_map.map_file) + #print(mc) stats = mc.get_maps_stats() - print(stats) + #print(stats) self.assertTrue(stats, {'file': 10, 'text': 4}) def test_99(self):
test for mapper.py instantiates Mapper with map_file
acutesoftware_AIKIF
train
py
23332537d51847b82d3eb1181ce4abc93890fd74
diff --git a/pyathenajdbc/cursor.py b/pyathenajdbc/cursor.py index <HASH>..<HASH> 100644 --- a/pyathenajdbc/cursor.py +++ b/pyathenajdbc/cursor.py @@ -108,7 +108,7 @@ class Cursor(object): self._result_set = None self._meta_data = None self._update_count = self._statement.getUpdatecount() - except Exception as e: + except Exception: _logger.exception('Failed to execute query.') reraise_dbapi_error()
Fix F<I> local variable 'e' is assigned to but never used
laughingman7743_PyAthenaJDBC
train
py
2149e3724836b1dbf754064316f79d52bb23ee91
diff --git a/ui/src/data_explorer/components/DatabaseList.js b/ui/src/data_explorer/components/DatabaseList.js index <HASH>..<HASH> 100644 --- a/ui/src/data_explorer/components/DatabaseList.js +++ b/ui/src/data_explorer/components/DatabaseList.js @@ -68,7 +68,7 @@ const DatabaseList = React.createClass({ const isActive = database === query.database && retentionPolicy === query.retentionPolicy return ( - <div className={classNames('query-builder--list-item', {active: isActive})} key={`${database}..${retentionPolicy}`} onClick={_.wrap(namespace, onChooseNamespace)}> + <div className={classNames('query-builder--list-item', {active: isActive})} key={`${database}..${retentionPolicy}`} onClick={isActive ? null : _.wrap(namespace, onChooseNamespace)}> {database}.{retentionPolicy} </div> )
Selecting an already selected Namespace doesn't reset the DE
influxdata_influxdb
train
js
44ce9ca71beb5b0aca1b21cb8c6e9420ce89639f
diff --git a/tests/jobs.py b/tests/jobs.py index <HASH>..<HASH> 100644 --- a/tests/jobs.py +++ b/tests/jobs.py @@ -2438,8 +2438,7 @@ class SchedulerJobTest(unittest.TestCase): execution_date=test_start_date)) # Now call manage_slas and see if the sla_miss callback gets called - scheduler = SchedulerJob(dag_id='test_sla_miss', - **self.default_scheduler_args) + scheduler = SchedulerJob(dag_id='test_sla_miss') with mock.patch('airflow.jobs.SchedulerJob.log', new_callable=PropertyMock) as mock_log: @@ -2481,8 +2480,7 @@ class SchedulerJobTest(unittest.TestCase): execution_date=test_start_date)) scheduler = SchedulerJob(dag_id='test_sla_miss', - num_runs=1, - **self.default_scheduler_args) + num_runs=1) with mock.patch('airflow.jobs.SchedulerJob.log', new_callable=PropertyMock) as mock_log:
[AIRFLOW-<I>][AIRFLOW-<I>] Fix CI failure caused by [] Closes #<I> from sekikn/AIRFLOW-<I>
apache_airflow
train
py
763745c4cb9379519870a2069239f3777dc5d4f3
diff --git a/avatar/__init__.py b/avatar/__init__.py index <HASH>..<HASH> 100644 --- a/avatar/__init__.py +++ b/avatar/__init__.py @@ -27,5 +27,7 @@ from avatar.models import Avatar def create_default_thumbnails(instance=None, created=False, **kwargs): if created: for size in AUTO_GENERATE_AVATAR_SIZES: + if AVATAR_DONT_SAVE_DUPLICATES and instance.thumbnail_exists(size): + return instance.create_thumbnail(size) signals.post_save.connect(create_default_thumbnails, sender=Avatar)
if AVATAR_DONT_SAVE_DUPLICATES is enabled don't generate a thumbnail over an existing one
GeoNode_geonode-avatar
train
py
33e4817516bf07615f02104f4e8584467314232b
diff --git a/Gulpfile.js b/Gulpfile.js index <HASH>..<HASH> 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -50,5 +50,5 @@ gulp.task('security', function(cb) { }); gulp.task('default', function(cb) { - runSequence('test', ['lint', 'style', 'coveralls', 'security'], cb); + runSequence('test', ['lint', 'style', 'coveralls'], cb); });
Temporarily disables gulp security task * The security package, `gulp-requireSafe`, has been deprecated. * `gulp-nsp` is its replacement. However, it does not yet work due to a bug. * This PR disables the security task. * I will reactivate the security task once `gulp-nsp` gets their house in order.
radify_angular-model
train
js
4bd77ee4347413820ed2e632ed9222261adaf5e9
diff --git a/lib/util.js b/lib/util.js index <HASH>..<HASH> 100644 --- a/lib/util.js +++ b/lib/util.js @@ -136,6 +136,10 @@ exports.unwritableError = function(result) { exports.setDebug = function(newDebug) { debug = newDebug === true; + + if (db) { + db = db.with({debug}); + } }; exports.assertConfigured = function() { @@ -167,7 +171,7 @@ exports.getFirebaseData = function() { exports.assertConfigured(); if (!db) { - db = database.create(rules, data.value, data.now); + db = database.create(rules, data.value, data.now).with({debug}); } return db;
Tests display evaluation details when debug is on
goldibex_targaryen
train
js
665509519fa2081e94a78a8c35f8bc0ceb0e9cbd
diff --git a/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php b/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php index <HASH>..<HASH> 100644 --- a/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php +++ b/src/Orderly/PayPalIpnBundle/Entity/IpnOrders.php @@ -605,9 +605,9 @@ class IpnOrders private $caseCreationDate; /** - * @var enumorderstatus $orderStatus + * @var string $orderStatus * - * @ORM\Column(name="order_status", type="enumorderstatus", nullable=true) + * @ORM\Column(name="order_status", type="string", nullable=true) */ private $orderStatus; @@ -2298,7 +2298,7 @@ class IpnOrders /** * Set orderStatus * - * @param enumorderstatus $orderStatus + * @param string $orderStatus */ public function setOrderStatus($orderStatus) { @@ -2308,7 +2308,7 @@ class IpnOrders /** * Get orderStatus * - * @return enumorderstatus + * @return string */ public function getOrderStatus() {
enumorderstatus -> string, fixing #2
snowplow-archive_symfony2-paypal-ipn
train
php
7ed6d50d6c8a6790110e29e239fd1405099cc3f2
diff --git a/spec/dummy/app/models/post.rb b/spec/dummy/app/models/post.rb index <HASH>..<HASH> 100644 --- a/spec/dummy/app/models/post.rb +++ b/spec/dummy/app/models/post.rb @@ -8,7 +8,7 @@ class Post < ActiveRecord::Base property :id property :title - property :body + property :body, if: scope(:read_post_body) property :user, selectable: true collection :comments, selectable: true
Add if: scope(:xxx) example to Post model in dummy app This increases test coverage of Garage::Representer#scope.
cookpad_garage
train
rb
196d5e6c06835c2b81a0d111b73905c6625fa4c7
diff --git a/bokeh/server/services.py b/bokeh/server/services.py index <HASH>..<HASH> 100644 --- a/bokeh/server/services.py +++ b/bokeh/server/services.py @@ -61,7 +61,7 @@ class ManagedProcess(object): -def start_redis(pidfilename, port, data_dir, loglevel="notice", +def start_redis(pidfilename, port, data_dir, loglevel="warning", data_file='redis.db', save=True): base_config = os.path.join(os.path.dirname(__file__), 'redis.conf') with open(base_config) as f:
Set redis loglevel to warning to avoid banner
bokeh_bokeh
train
py
c54f683e953a87d9adf0bf889be0e86affe44676
diff --git a/src/Solr/Stores/SolrConfigStore_Post.php b/src/Solr/Stores/SolrConfigStore_Post.php index <HASH>..<HASH> 100644 --- a/src/Solr/Stores/SolrConfigStore_Post.php +++ b/src/Solr/Stores/SolrConfigStore_Post.php @@ -30,7 +30,10 @@ class SolrConfigStore_Post implements SolrConfigStore $options['host'] . ':' . $options['port'], $config['path'] ]); - $this->remote = $config['remotepath']; + + if (isset($config['remotepath'])) { + $this->remote = $config['remotepath']; + } } /**
FIX Make remotepath optional to restore compatibility with CWP
silverstripe_silverstripe-fulltextsearch
train
php
941dd9d10ecc81ced4ce063a9ccd4fcb2e92ca0d
diff --git a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py b/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py index <HASH>..<HASH> 100644 --- a/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py +++ b/tests/src/OneLogin/saml2_tests/idp_metadata_parser_test.py @@ -641,6 +641,7 @@ class OneLogin_Saml2_IdPMetadataParser_Test(unittest.TestCase): expected_settings3 = json.loads(expected_settings3_json) self.assertEqual(expected_settings3, settings_result3) + if __name__ == '__main__': runner = unittest.TextTestRunner() unittest.main(testRunner=runner)
expected 2 blank lines after class or function definition
onelogin_python-saml
train
py
8541c0526faf51ea3a714be0a606eb28779e853a
diff --git a/lib/components/app/responsive-webapp.js b/lib/components/app/responsive-webapp.js index <HASH>..<HASH> 100644 --- a/lib/components/app/responsive-webapp.js +++ b/lib/components/app/responsive-webapp.js @@ -238,7 +238,7 @@ class RouterWrapperWithAuth0 extends Component { path={'/savetrip'} component={(routerProps) => { const props = this._combineProps(routerProps) - return <SavedTripScreen wizard {...props} /> + return <SavedTripScreen isCreating {...props} /> }} /> <Route
refactor(Responsive): Finish rename prop.
opentripplanner_otp-react-redux
train
js
64115c0b88b0b1f7d22f62c56f2c03fc726871af
diff --git a/src/components/autocomplete/js/autocompleteDirective.js b/src/components/autocomplete/js/autocompleteDirective.js index <HASH>..<HASH> 100644 --- a/src/components/autocomplete/js/autocompleteDirective.js +++ b/src/components/autocomplete/js/autocompleteDirective.js @@ -19,6 +19,8 @@ angular * no matches were found. You can do this by wrapping your template in `md-item-template` and * adding a tag for `md-not-found`. An example of this is shown below. * + * To reset the displayed value you must clear both values for `md-search-text` and `md-selected-item`. + * * ### Validation * * You can use `ng-messages` to include validation the same way that you would normally validate;
(docs): how to reset of value of autocomplete I spent a lot of time trying to figure out how to reset the displayed value of an autocomplete that I was (re)using in a drawer. I eventually found the answer in this issue: <URL>
angular_material
train
js
e092b641955ca753708384a73a9a159c9af817dd
diff --git a/test/unit/support.js b/test/unit/support.js index <HASH>..<HASH> 100644 --- a/test/unit/support.js +++ b/test/unit/support.js @@ -248,7 +248,7 @@ testIframeWithCallback( "A background on the testElement does not cause IE8 to c if ( expected ) { test("Verify that the support tests resolve as expected per browser", function() { - expect( jQuery(expected).size() ); + expect( 30 ); for ( var i in expected ) { if ( jQuery.ajax || i !== "ajax" && i !== "cors" ) {
Don't try to be dynamic, just get the damn job done. Expects = <I>.
jquery_jquery
train
js
f5cf83171ae8c26070036c0d77897e2e4250362c
diff --git a/lib/Configuration.js b/lib/Configuration.js index <HASH>..<HASH> 100644 --- a/lib/Configuration.js +++ b/lib/Configuration.js @@ -31,7 +31,7 @@ const DEFAULT_CONFIG = { namedExports: {}, environments: [], excludes: [], - globals: ['module', 'require'], + globals: ['module', 'require', 'console'], groupImports: true, ignorePackagePrefixes: [], importDevDependencies: false, diff --git a/lib/importjs.js b/lib/importjs.js index <HASH>..<HASH> 100644 --- a/lib/importjs.js +++ b/lib/importjs.js @@ -1,5 +1,4 @@ // @flow -import console from 'console'; import fs from 'fs'; import program from 'commander';
Don't import `console` Adding this to the list of default globals should prevent accidentally importing something named `console`.
Galooshi_import-js
train
js,js
7965cd1d09f481944f904b8d19c6a78c692e5338
diff --git a/gulpfile.js b/gulpfile.js index <HASH>..<HASH> 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -29,9 +29,9 @@ const pkg = require( './package.json' ), minDistFilePath = distFolder + minDistFilename; -gulp.task( 'default', [ 'lint', 'doc', 'test' ] ); +gulp.task( 'default', [ 'doc', 'test' ] ); gulp.task( 'lint', lintTask ); -gulp.task( 'build', buildTask ); +gulp.task( 'build', [ 'lint' ], buildTask ); gulp.task( 'test', [ 'build' ], testTask ); gulp.task( 'doc', [ 'build', 'typescript' ], docTask ); gulp.task( 'serve', [ 'typescript', 'doc' ], serveTask );
Update Gulpfile to always lint before building
gregjacobs_Autolinker.js
train
js
f0b7e74fccf046aff53c2214f71be7865055a7e9
diff --git a/simuvex/procedures/libc.so.6/strstr.py b/simuvex/procedures/libc.so.6/strstr.py index <HASH>..<HASH> 100644 --- a/simuvex/procedures/libc.so.6/strstr.py +++ b/simuvex/procedures/libc.so.6/strstr.py @@ -18,12 +18,9 @@ class strstr(simuvex.SimProcedure): haystack_strlen = strlen(self.state, inline=True, arguments=[haystack_addr]) needle_strlen = strlen(self.state, inline=True, arguments=[needle_addr]) - haystack_lenval = self.state.expr_value(haystack_strlen.ret_expr) - needle_lenval = self.state.expr_value(needle_strlen.ret_expr) - # naive approach - haystack_maxlen = haystack_lenval.max() - needle_maxlen = needle_lenval.max() + haystack_maxlen = haystack_strlen.maximum_null + needle_maxlen = needle_strlen.maximum_null l.debug("Maxlen: %d, %d", haystack_maxlen, needle_maxlen) l.debug("addrs: %s, %s", haystack_addr, needle_addr)
Fixing an issue in strstr.py.
angr_angr
train
py
1321b372122c130e21397051db7a36594f5d660d
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index <HASH>..<HASH> 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/class/attribute_accessors' + module ActiveSupport # Inspired by the buffered logger idea by Ezra class BufferedLogger
Explict class attribute accessor dependency
rails_rails
train
rb
e4ba8e6618a101fb8a46384c72f9553451078420
diff --git a/lib/active_merchant/billing/gateways/ebanx.rb b/lib/active_merchant/billing/gateways/ebanx.rb index <HASH>..<HASH> 100644 --- a/lib/active_merchant/billing/gateways/ebanx.rb +++ b/lib/active_merchant/billing/gateways/ebanx.rb @@ -1,15 +1,15 @@ module ActiveMerchant #:nodoc: module Billing #:nodoc: class EbanxGateway < Gateway - self.test_url = 'https://sandbox.ebanx.com/ws/' - self.live_url = 'https://api.ebanx.com/ws/' + self.test_url = 'https://sandbox.ebanxpay.com/ws/' + self.live_url = 'https://api.ebanxpay.com/ws/' self.supported_countries = ['BR', 'MX', 'CO'] self.default_currency = 'USD' self.supported_cardtypes = [:visa, :master, :american_express, :discover, :diners_club] self.homepage_url = 'http://www.ebanx.com/' - self.display_name = 'Ebanx' + self.display_name = 'EBANX' CARD_BRAND = { visa: 'visa',
Update EBANX API URL Remote tests failing don't appear to be related to the URL change. Unit: <I> tests, <I> assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications <I>% passed Remote: <I> tests, <I> assertions, 3 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications <I>% passed Closes #<I>
activemerchant_active_merchant
train
rb
0c494cbfdff10eb627cfa1ebf5af573984d51a37
diff --git a/src/datamodel/gfunc.py b/src/datamodel/gfunc.py index <HASH>..<HASH> 100644 --- a/src/datamodel/gfunc.py +++ b/src/datamodel/gfunc.py @@ -350,7 +350,8 @@ class Gfunc(Ugrid): self.xmin[1], self.xmax[1]] aspect = self.tsize[1] / self.tsize[0] dsp_kwargs.update({'interpolation': 'none', 'cmap': gray, - 'extent': extent, 'aspect': aspect}) + 'extent': extent, 'aspect': aspect, + 'origin': 'lower'}) elif method == 'scatter': coo_arr = self.coord.asarr() args_re = [coo_arr[:, 0], coo_arr[:, 1], self.fvals.real]
fix y axis swap in imshow method
odlgroup_odl
train
py
11ead8b48af6942b604a0639947a7b8a9b53c66b
diff --git a/agent/format-2.0.go b/agent/format-2.0.go index <HASH>..<HASH> 100644 --- a/agent/format-2.0.go +++ b/agent/format-2.0.go @@ -139,8 +139,14 @@ func (formatter_2_0) unmarshal(data []byte) (*configInternal, error) { } } - // Mongo version is set, we might be running a version other than default. + + // TODO (anastasiamac 2016-06-17) Mongo version must be set. + // For scenarios where mongo version is not set, we should still + // be explicit about what "default" mongo version is. After these lines, + // config.mongoVersion should not be empty under any circumstance. + // Bug# 1593855 if format.MongoVersion != "" { + // Mongo version is set, we might be running a version other than default. config.mongoVersion = format.MongoVersion } return config, nil
Added comment with bug number: need to always have mongo version in agent.config file.
juju_juju
train
go
158b11e2a294f8a6db45f8aeaa7b28e359f56b1b
diff --git a/deis/__init__.py b/deis/__init__.py index <HASH>..<HASH> 100644 --- a/deis/__init__.py +++ b/deis/__init__.py @@ -9,4 +9,4 @@ from __future__ import absolute_import from .celery import app # noqa -__version__ = '0.9.0' +__version__ = '0.10.0'
Switch master to <I>.
deis_controller-sdk-go
train
py
c03802cee1def27f72e651653c8553aa5c1d0548
diff --git a/ast_test.go b/ast_test.go index <HASH>..<HASH> 100644 --- a/ast_test.go +++ b/ast_test.go @@ -566,6 +566,18 @@ var astTests = []testCase{ }, { []string{ + "foo <<\\EOF\nbar\nEOF", + "foo <<\\EOF\nbar", + }, + Stmt{ + Node: litCmd("foo"), + Redirs: []Redirect{ + {Op: SHL, Word: litWord("\\EOF\nbar\nEOF")}, + }, + }, + }, + { + []string{ "foo <<-EOF\nbar\nEOF", "foo <<- EOF\nbar\nEOF", }, diff --git a/parse.go b/parse.go index <HASH>..<HASH> 100644 --- a/parse.go +++ b/parse.go @@ -949,6 +949,11 @@ func unquote(w Word) (unq Word) { unq.Parts = append(unq.Parts, Lit{Value: x.Value}) case DblQuoted: unq.Parts = append(unq.Parts, x.Parts...) + case Lit: + if x.Value[0] == '\\' { + x.Value = x.Value[1:] + } + unq.Parts = append(unq.Parts, x) default: unq.Parts = append(unq.Parts, n) }
When unquoting heredoc words, drop leading \ Couldn't find any documentation on this, but both dash and bash seem to do this.
mvdan_sh
train
go,go
d0d9ec216ab1eef4702be406d36310c9dd254690
diff --git a/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java b/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java index <HASH>..<HASH> 100644 --- a/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java +++ b/hazelcast/src/main/java/com/hazelcast/map/DefaultRecordStore.java @@ -906,9 +906,9 @@ public class DefaultRecordStore implements RecordStore { } private void cancelAssociatedSchedulers(Set<Data> keySet) { - if(keySet == null || keySet.isEmpty() ) return; + if (keySet == null || keySet.isEmpty()) return; - for (Data key : keySet ){ + for (Data key : keySet) { cancelAssociatedSchedulers(key); } } @@ -929,6 +929,10 @@ public class DefaultRecordStore implements RecordStore { final NodeEngine nodeEngine = mapService.getNodeEngine(); Map values = mapContainer.getStore().loadAll(keys.values()); + if (values == null || values.isEmpty()) { + loaded.set(true); + return; + } MapEntrySet entrySet = new MapEntrySet(); for (Data dataKey : keys.keySet()) {
fixes a bug: set loaded=true if partition has no entry.
hazelcast_hazelcast
train
java
96a584dee27c0285623d4e17ddaf3c0274dc1675
diff --git a/command/agent/agent_test.go b/command/agent/agent_test.go index <HASH>..<HASH> 100644 --- a/command/agent/agent_test.go +++ b/command/agent/agent_test.go @@ -156,22 +156,17 @@ func TestRetryJoinFail(t *testing.T) { func TestRetryJoinWanFail(t *testing.T) { t.Parallel() - t.Skip("fs: skipping tests that use cmd.Run until signal handling is fixed") - cfg := agent.TestConfig() tmpDir := testutil.TempDir(t, "consul") defer os.RemoveAll(tmpDir) - shutdownCh := make(chan struct{}) - defer close(shutdownCh) - ui := cli.NewMockUi() - cmd := New(ui, "", "", "", "", shutdownCh) + cmd := New(ui, "", "", "", "", nil) args := []string{ "-server", - "-bind", cfg.BindAddr.String(), + "-bind", "127.0.0.1", "-data-dir", tmpDir, - "-retry-join-wan", cfg.SerfBindAddrWAN.String(), + "-retry-join-wan", "127.0.0.1:99", "-retry-max-wan", "1", "-retry-interval-wan", "10ms", }
agent: fix TestRetryJoinWanFail
hashicorp_consul
train
go
42df9e46d9cfb2bf1ff07e7b71f8988b6ff0b9a4
diff --git a/ui/src/components/infinite-scroll/QInfiniteScroll.js b/ui/src/components/infinite-scroll/QInfiniteScroll.js index <HASH>..<HASH> 100644 --- a/ui/src/components/infinite-scroll/QInfiniteScroll.js +++ b/ui/src/components/infinite-scroll/QInfiniteScroll.js @@ -184,12 +184,13 @@ export default Vue.extend({ }, render (h) { - const content = this.$scopedSlots.default !== void 0 - ? this.$scopedSlots.default() - : [] - const body = this.fetching === true - ? [ h('div', { staticClass: 'q-infinite-scroll__loading' }, slot(this, 'loading')) ] - : [] + const content = slot(this, 'default') + const body = [ + h('div', { + staticClass: 'q-infinite-scroll__loading', + class: this.fetching === true ? '' : 'invisible' + }, slot(this, 'loading')) + ] return h( 'div',
feat(QInfiniteScroll): Persist loading indicator to make scroll stable #<I>
quasarframework_quasar
train
js
18925d08f1b32f184d0e43955d29dff4ad121c10
diff --git a/salt/renderers/__init__.py b/salt/renderers/__init__.py index <HASH>..<HASH> 100644 --- a/salt/renderers/__init__.py +++ b/salt/renderers/__init__.py @@ -0,0 +1,4 @@ +# -*- coding: utf-8 -*- +''' +Renderers Directory +'''
add encoding and docstring for renderers
saltstack_salt
train
py
89da6a8648a778577432baf58d3d32bf8801fbae
diff --git a/lib/mongoid/relations/embedded/many.rb b/lib/mongoid/relations/embedded/many.rb index <HASH>..<HASH> 100644 --- a/lib/mongoid/relations/embedded/many.rb +++ b/lib/mongoid/relations/embedded/many.rb @@ -170,7 +170,8 @@ module Mongoid # @since 3.1.0 def delete_if if block_given? - target.each do |doc| + dup_target = target.dup + dup_target.each do |doc| delete(doc) if yield(doc) end self
FIX #<I> Embedded documents deleting
mongodb_mongoid
train
rb
a4261d481c5f4d3d00eced3684494bc84874756e
diff --git a/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java b/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java index <HASH>..<HASH> 100644 --- a/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java +++ b/handler/src/main/java/io/netty/handler/ssl/JdkNpnApplicationProtocolNegotiator.java @@ -25,7 +25,7 @@ public final class JdkNpnApplicationProtocolNegotiator extends JdkBaseApplicatio { if (!JdkNpnSslEngine.isAvailable()) { throw new RuntimeException("NPN unsupported. Is your classpatch configured correctly?" - + " See http://www.eclipse.org/jetty/documentation/current/npn-chapter.html#npn-starting"); + + " See https://wiki.eclipse.org/Jetty/Feature/NPN"); } }
Eclipse SPDY docs moved Motivation: We provide a hyperlink to the docs for SPDY if the runtime is not setup correctly to help users. These docs have moved. Modifications: - Update the hyperlink to point to the new doc location. Result: Users are able to find docs more easily.
netty_netty
train
java
388315a9b1fb634959815dbdae2795663f177d9f
diff --git a/httpfile.go b/httpfile.go index <HASH>..<HASH> 100644 --- a/httpfile.go +++ b/httpfile.go @@ -110,12 +110,13 @@ func (f *HttpFile) ReadAt(p []byte, off int64) (int, error) { return 0, &HttpFileError{Err: fmt.Errorf("Unexpected Content-Range %q (%d)", content_range, n)} } - r, err := resp.Body.Read(p) - if err != nil { - return 0, err + n, err = resp.Body.Read(p) + if n > 0 && err == io.EOF { + // read reached EOF, but archive/zip doesn't like this! + err = nil } - return r, nil + return n, err } // The Reader interface
Turns out archive/zip doesn't like a ReadAt that returns n>0 AND io.EOF (even if the specification for ReaderAt/Read say this should be possible).
gobs_httpclient
train
go
73790b8f6d9e878c13401b7139d0221b5a9698d6
diff --git a/test/e2e/autoscaling/cluster_size_autoscaling.go b/test/e2e/autoscaling/cluster_size_autoscaling.go index <HASH>..<HASH> 100644 --- a/test/e2e/autoscaling/cluster_size_autoscaling.go +++ b/test/e2e/autoscaling/cluster_size_autoscaling.go @@ -1926,12 +1926,18 @@ func createPriorityClasses(f *framework.Framework) func() { } for className, priority := range priorityClasses { _, err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Create(&schedulerapi.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: className}, Value: priority}) + if err != nil { + glog.Errorf("Error creating priority class: %v", err) + } Expect(err == nil || errors.IsAlreadyExists(err)).To(Equal(true)) } return func() { for className := range priorityClasses { - f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(className, nil) + err := f.ClientSet.SchedulingV1beta1().PriorityClasses().Delete(className, nil) + if err != nil { + glog.Errorf("Error deleting priority class: %v", err) + } } } }
Log error in e2e tests when creating priority classes
kubernetes_kubernetes
train
go
dd27ed5ad4c6ee4fc4b3f2e9f906c64d99924d6f
diff --git a/lib/page.js b/lib/page.js index <HASH>..<HASH> 100644 --- a/lib/page.js +++ b/lib/page.js @@ -22,7 +22,6 @@ var events = require('events') function Page(path) { events.EventEmitter.call(this); this.path = path; - this.url = path; this._isOpen = false; }
Remove url from page, set latter by middleware.
jaredhanson_kerouac
train
js
4c83a5fa258b5e20b1ab4c07c18262579e0f0de9
diff --git a/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java b/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java index <HASH>..<HASH> 100644 --- a/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java +++ b/person-directory-impl/src/main/java/org/apereo/services/persondir/support/ldap/LdaptivePersonAttributeDao.java @@ -52,7 +52,7 @@ import java.util.Map; * @author Marvin S. Addison * @since 4.0.0 */ -public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao<FilterTemplate> { +public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao<FilterTemplate> implements AutoCloseable { /** * Logger instance. @@ -270,4 +270,11 @@ public class LdaptivePersonAttributeDao extends AbstractQueryPersonAttributeDao< logger.debug("Converted ldap DN entry [{}] to attribute map {}", entry.getDn(), attributeMap.toString()); return attributeMap; } + + @Override + public void close() { + if (connectionFactory != null) { + connectionFactory.close(); + } + } }
allow ldap dao to close connection factories
apereo_person-directory
train
java
353440e83e29b5525463ee11e74ddaa1e7a36a15
diff --git a/src/main/java/common/Internet.java b/src/main/java/common/Internet.java index <HASH>..<HASH> 100644 --- a/src/main/java/common/Internet.java +++ b/src/main/java/common/Internet.java @@ -83,7 +83,7 @@ public class Internet { connection.setRequestProperty("Content-Type", "application/json"); connection.setRequestProperty("charset", "utf-8"); DataOutputStream wr = new DataOutputStream(connection.getOutputStream()); - ByteStringConverter bs = new ByteStringConverter(); + // ByteStringConverter bs = new ByteStringConverter(); wr.write(postData2); connection.connect();
Removed bs in class internet as it is never used locally
vatbub_common
train
java
d4f2173ec04d35a1c00d3a46306a4ad6196a02d0
diff --git a/src/MailMimeParser.php b/src/MailMimeParser.php index <HASH>..<HASH> 100644 --- a/src/MailMimeParser.php +++ b/src/MailMimeParser.php @@ -6,6 +6,9 @@ */ namespace ZBateson\MailMimeParser; +use GuzzleHttp\Psr7; +use GuzzleHttp\Psr7\StreamWrapper; + /** * Parses a MIME message into a \ZBateson\MailMimeParser\Message object. * @@ -75,15 +78,14 @@ class MailMimeParser */ public function parse($handleOrString) { - // $tempHandle is attached to $message, and closed in its destructor - $tempHandle = fopen('php://temp', 'r+'); - if (is_string($handleOrString)) { - fwrite($tempHandle, $handleOrString); - } else { - stream_copy_to_stream($handleOrString, $tempHandle); - } - rewind($tempHandle); + $stream = Psr7\stream_for($handleOrString); + $copy = Psr7\stream_for(fopen('php://temp', 'r+')); + + Psr7\copy_to_stream($stream, $copy); + $copy->rewind(); + // don't close it when $stream gets destroyed + $stream->detach(); $parser = $this->di->newMessageParser(); - return $parser->parse($tempHandle); + return $parser->parse(StreamWrapper::getResource($copy)); } }
Refactor MailMimeParser::parse to use Psr7 stream
zbateson_mail-mime-parser
train
php
9f99c6b6b2a2757f1f1167235ac7a16dc7bccf66
diff --git a/modules/webservices/debugger.php b/modules/webservices/debugger.php index <HASH>..<HASH> 100644 --- a/modules/webservices/debugger.php +++ b/modules/webservices/debugger.php @@ -31,7 +31,7 @@ if ( $target != 'action' && $target != 'controller' && $target != 'visualeditor' $params .= '&host=' . $url['host']; $params .= '&port=' . ( isset( $url['port'] ) ? $url['port'] : '' ); $params .= '&path=' . ( isset( $url['path'] ) ? $url['path'] : '/' ); - if ( $url['scheme'] == 'htps' ) + if ( $url['scheme'] == 'https' ) { $params .= '&protocol=2'; }
- one fix for https urls
gggeek_ggwebservices
train
php
d5fb311456345ec166446bc3f85052efd34a8e9c
diff --git a/public/js/user.js b/public/js/user.js index <HASH>..<HASH> 100644 --- a/public/js/user.js +++ b/public/js/user.js @@ -408,7 +408,10 @@ apos.define('apostrophe-workflow', { self.skipAllRelated = false; self.nextExportHint = []; if (!ids.length) { - return apos.notify('No modifications to commit.', { type: 'warn', dismiss: true }); + apos.notify('No modifications to commit.', { type: 'warn', dismiss: true }); + if (callback) { + return callback(null); + } } var leadId = options.leadId || (apos.contextPiece && apos.contextPiece._id) || (apos.pages.page && apos.pages.page._id); if (!_.contains(ids, leadId)) {
Fix obvious bug: don't forget to invoke the callback if present and there is no work to do
apostrophecms_apostrophe-workflow
train
js
d8b9e72682bdd92243d149b4e256ede30cba1bc9
diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js index <HASH>..<HASH> 100644 --- a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js @@ -48,10 +48,12 @@ export function getBreakPoints( const precision = delta === 0 ? 0 : Math.max(0, Math.ceil(Math.log10(1 / delta))); const extraBucket = maxValue > maxValue.toFixed(precision) ? 1 : 0; + const startValue = + minValue < minValue.toFixed(precision) ? minValue - 1 : minValue; return new Array(numBuckets + 1 + extraBucket) .fill() - .map((_, i) => (minValue + i * delta).toFixed(precision)); + .map((_, i) => (startValue + i * delta).toFixed(precision)); } return formDataBreakPoints.sort((a, b) => parseFloat(a) - parseFloat(b));
make to change the getBreakPoints of polygon chart (#<I>)
apache_incubator-superset
train
js
e9f0370024c15a8d76b335fe1abe0ef86bf68dda
diff --git a/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java b/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java index <HASH>..<HASH> 100644 --- a/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java +++ b/src/main/java/net/sf/jabb/quartz/AutowiringSpringBeanJobFactory.java @@ -27,10 +27,20 @@ public class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory impleme private static final Log log = LogFactory.getLog(AutowiringSpringBeanJobFactory.class); static private AutowireCapableBeanFactory beanFactory; + static private ApplicationContext appContext; + + /** + * This is a convenient method for getting the application context + * @return the application context + */ + static public ApplicationContext getApplicationContenxt(){ + return appContext; + } @Override public void setApplicationContext(ApplicationContext appContext) throws BeansException { + AutowiringSpringBeanJobFactory.appContext = appContext; setBeanFacotry(appContext.getAutowireCapableBeanFactory()); }
allow the application context to be got easily from non-spring codes
james-hu_jabb-core
train
java
fe6b6ab947aa70ed2edb78124de10a4bd4df9d3a
diff --git a/src/Command/Environment/EnvironmentDrushCommand.php b/src/Command/Environment/EnvironmentDrushCommand.php index <HASH>..<HASH> 100644 --- a/src/Command/Environment/EnvironmentDrushCommand.php +++ b/src/Command/Environment/EnvironmentDrushCommand.php @@ -46,9 +46,7 @@ class EnvironmentDrushCommand extends CommandBase $this->validateInput($input); $drushCommand = $input->getArgument('cmd'); - if (is_array($drushCommand)) { - $drushCommand = implode(' ', $drushCommand); - } + $drushCommand = implode(' ', array_map([OsUtil::class, 'escapePosixShellArg'], (array) $drushCommand)); // Pass through options that the CLI shares with Drush. foreach (['yes', 'no', 'quiet'] as $option) {
Fix argument escaping in drush command
platformsh_platformsh-cli
train
php
681ce93e7e58956cb78ef81bc165558b84d6ebb0
diff --git a/docs/conf.py b/docs/conf.py index <HASH>..<HASH> 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,5 @@ import sys +import warnings from pathlib import Path from datetime import datetime @@ -9,6 +10,9 @@ matplotlib.use('agg') HERE = Path(__file__).parent sys.path.insert(0, str(HERE.parent)) import scanpy # noqa +with warnings.catch_warnings(): + warnings.filterwarnings('ignore', category=FutureWarning) + import scanpy.api # -- General configuration ------------------------------------------------
Suppress FutureWarning when building docs
theislab_scanpy
train
py
464b53f5e479d7f6a07fbc62b0f5335e9b55a1dc
diff --git a/examples/conftest.py b/examples/conftest.py index <HASH>..<HASH> 100644 --- a/examples/conftest.py +++ b/examples/conftest.py @@ -2,6 +2,7 @@ # by pytest before any tests are run import sys +import warnings from os.path import abspath, dirname, join @@ -9,3 +10,7 @@ from os.path import abspath, dirname, join # 'pip install -e .[dev]' when switching between checkouts and running tests. git_repo_path = abspath(join(dirname(dirname(__file__)), "src")) sys.path.insert(1, git_repo_path) + +# silence FutureWarning warnings in tests since often we can't act on them until +# they become normal warnings - i.e. the tests still need to test the current functionality +warnings.simplefilter(action="ignore", category=FutureWarning)
[testing] disable FutureWarning in examples tests (#<I>) * [testing] disable FutureWarning in examples tests same as tests/conftest.py, we can't resolve those warning, so turn the noise off. * fix
huggingface_pytorch-pretrained-BERT
train
py
5a5f1383db3f2ad0e7c430b0d882ca29e1fa43f9
diff --git a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb index <HASH>..<HASH> 100644 --- a/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb +++ b/rails_event_store_active_record/lib/rails_event_store_active_record/event_repository.rb @@ -14,7 +14,7 @@ module RailsEventStoreActiveRecord def append_to_stream(events, stream, expected_version) records, event_ids = [], [] Array(events).each do |event| - records << build_event_record(event) + records << build_event_hash(event) event_ids << event.event_id end add_to_stream(event_ids, stream, expected_version, true) do @@ -116,13 +116,13 @@ module RailsEventStoreActiveRecord IndexViolationDetector.new.detect(message) end - def build_event_record(serialized_record) - Event.new( + def build_event_hash(serialized_record) + { id: serialized_record.event_id, data: serialized_record.data, metadata: serialized_record.metadata, event_type: serialized_record.event_type - ) + } end # Overwritten in a sub-class
Killing mutants: hash is enough here All the rest will be handled by activerecord-import.
RailsEventStore_rails_event_store
train
rb
9e1542db4bc003f1edb67ad4e25d1469f6aecb70
diff --git a/Kwf/Component/Plugin/Password/LoginForm/Component.php b/Kwf/Component/Plugin/Password/LoginForm/Component.php index <HASH>..<HASH> 100644 --- a/Kwf/Component/Plugin/Password/LoginForm/Component.php +++ b/Kwf/Component/Plugin/Password/LoginForm/Component.php @@ -5,6 +5,7 @@ class Kwf_Component_Plugin_Password_LoginForm_Component extends Kwc_Form_Compone { $ret = parent::getSettings(); $ret['generators']['child']['component']['success'] = false; + $ret['useAjaxRequest'] = false; return $ret; }
don't use ajax request in password plugin form
koala-framework_koala-framework
train
php
d921651b2737f5cfe711868fab558a8ef79e26ca
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ setup_kwargs = { 'version': '4.1.0', 'description': 'A set that remembers its order, and allows looking up its items by their index in that order.', 'author': 'Elia Robyn Lake', - 'author_email': 'elial@ec.ai', + 'author_email': 'gh@arborelia.net', 'url': 'https://github.com/rspeer/ordered-set', 'packages': packages, 'python_requires': '>=3.7',
use personal email in setup.py
LuminosoInsight_ordered-set
train
py
c81d881316ab65668fd410fad0d4db8fa858e9ff
diff --git a/lib/oxmlk/description.rb b/lib/oxmlk/description.rb index <HASH>..<HASH> 100644 --- a/lib/oxmlk/description.rb +++ b/lib/oxmlk/description.rb @@ -138,7 +138,7 @@ module OxMlk end def wrap(xpath=nil) - [@in,xpath].compact.join('/') + (xpath.split('|').map {|x| [@in,x].compact.join('/') }).join('|') end end end \ No newline at end of file diff --git a/spec/description_spec.rb b/spec/description_spec.rb index <HASH>..<HASH> 100644 --- a/spec/description_spec.rb +++ b/spec/description_spec.rb @@ -45,10 +45,15 @@ describe OxMlk::Description do @desc.xpath.should == 'number|person' end - it 'should add in + / to xpath if :in is passed' do + it 'should add :in + / to xpath if :in is passed' do @desc = OxMlk::Description.new(:person, :in => :friends) @desc.xpath.should == 'friends/person' end + + it 'should add :in + / to all items in array of ox_objetcs' do + @desc = OxMlk::Description.new(:digits, :as => [Number,Person], :in => :friends) + @desc.xpath.should == 'friends/number|friends/person' + end end describe '#accessor' do
fixed bug where :in only applied to first item in xpath with multiple elements
hexorx_oxmlk
train
rb,rb
26abf0225e2691ca01f021f1a6d2999ceef75041
diff --git a/src/Propel/Generator/Command/templates/propel.json.php b/src/Propel/Generator/Command/templates/propel.json.php index <HASH>..<HASH> 100644 --- a/src/Propel/Generator/Command/templates/propel.json.php +++ b/src/Propel/Generator/Command/templates/propel.json.php @@ -6,7 +6,7 @@ 'adapter' => $rdbms, 'dsn' => $dsn, 'user' => $user, - 'password' => '', + 'password' => $password, 'settings' => [ 'charset' => $charset ]
Fixed password not set in json config by `propel init`
propelorm_Propel2
train
php
7d8a8152cdd21f809742d5eec4f0fd1ed3ff0284
diff --git a/DependencyInjection/Source/JWKSetSource/JWKSets.php b/DependencyInjection/Source/JWKSetSource/JWKSets.php index <HASH>..<HASH> 100644 --- a/DependencyInjection/Source/JWKSetSource/JWKSets.php +++ b/DependencyInjection/Source/JWKSetSource/JWKSets.php @@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Reference; -class JWKSets extends AbstractJWKSetSource implements JWKSetSourceInterface +class JWKSets extends AbstractJWKSetSource { /** * {@inheritdoc}
Update JWKSets.php
Spomky-Labs_jose-bundle
train
php
55466ab3bc2083df1a97a9da1071e8262932da65
diff --git a/cmd/cert.go b/cmd/cert.go index <HASH>..<HASH> 100644 --- a/cmd/cert.go +++ b/cmd/cert.go @@ -35,8 +35,8 @@ func init() { certCmd.PersistentFlags().String(cert.FlagKeyType, "RSA", "Type of key to generate. [string]") certCmd.PersistentFlags().StringSlice(cert.FlagIpSans, []string{}, "IP sans. [[]string] (default none)") certCmd.PersistentFlags().StringSlice(cert.FlagSanHosts, []string{}, "Host Sans. [[]string] (default none)") - certCmd.PersistentFlags().String(cert.FlagOwner, "root", "Owner of created file/directories. Uid value also accepted. [string]") - certCmd.PersistentFlags().String(cert.FlagGroup, "root", "Group of created file/directories. Gid value also accepted. [string]") + certCmd.PersistentFlags().String(cert.FlagOwner, "0", "Owner of created file/directories. Uid value also accepted. [string]") + certCmd.PersistentFlags().String(cert.FlagGroup, "0", "Group of created file/directories. Gid value also accepted. [string]") RootCmd.AddCommand(certCmd) }
Set owner/group flag default to "0" - This commit fixes #<I>
jetstack_vault-helper
train
go
aaf9e508d0d1817ac527ad1cfb5fc3847b8eac9e
diff --git a/jsontableschema_pandas/__init__.py b/jsontableschema_pandas/__init__.py index <HASH>..<HASH> 100644 --- a/jsontableschema_pandas/__init__.py +++ b/jsontableschema_pandas/__init__.py @@ -4,4 +4,16 @@ from __future__ import print_function from __future__ import absolute_import from __future__ import unicode_literals + +# Module API + from .storage import Storage + + +# Version + +import io +import os +__version__ = io.open( + os.path.join(os.path.dirname(__file__), 'VERSION'), + encoding='utf-8').read().strip()
Exposed package version (fixes #<I>)
frictionlessdata_tableschema-pandas-py
train
py
975a33e7e7191ff8c251a19a574e44510d0ee9ea
diff --git a/lib/phpmailer/class.phpmailer.php b/lib/phpmailer/class.phpmailer.php index <HASH>..<HASH> 100644 --- a/lib/phpmailer/class.phpmailer.php +++ b/lib/phpmailer/class.phpmailer.php @@ -471,7 +471,7 @@ class PHPMailer * @return bool */ function SmtpSend($header, $body) { - include_once($this->PluginDir . "class.smtp.php"); + include_once("class.smtp.php"); $error = ""; $bad_rcpt = array();
OK, aligning this to the same as STABLE ... there's been a bit of a mixup about this file. It's now standard with the single addition of a constructor to set this->PluginDir, and this is now used for the language file includes.
moodle_moodle
train
php
a88df7ab0a19bcf64e250d9588b377b1fb8c84d9
diff --git a/lib/verilog/file.rb b/lib/verilog/file.rb index <HASH>..<HASH> 100644 --- a/lib/verilog/file.rb +++ b/lib/verilog/file.rb @@ -61,7 +61,7 @@ module Verilog def instantiations inst = [] - @contents.scan(/(^\s*)(\w+)(\s+#\([.,\(\)\w\s]*\))?(\s+\w+\s*)(\([.,\(\)\w\s]*\))?;/mi){ inst << $2 } + @contents.scan(/(^\s*)(\w+)(\s+#\([.,\(\)\w\s]*\))?(\s+\w+\s*)(\([.,\(\)\w\s\/]*\))?;/mi){ inst << $2 } #Hack, module will also match the instantiation syntax, remove via array subtraction inst = inst - ['module']
Allowing comments after a port.
morganp_verilog
train
rb
2439ce4366d57655f66653f759f1ec3d14e36559
diff --git a/zenpy/lib/objects/events/ticket_event.py b/zenpy/lib/objects/events/ticket_event.py index <HASH>..<HASH> 100644 --- a/zenpy/lib/objects/events/ticket_event.py +++ b/zenpy/lib/objects/events/ticket_event.py @@ -10,7 +10,6 @@ class TicketEvent(BaseObject): self.updater_id = None self.child_events = None self.timestamp = None - self._ticket = None self.ticket_id = None self._system = None @@ -27,12 +26,3 @@ class TicketEvent(BaseObject): @updater.setter def updater(self, value): self._updater = value - - @property - def ticket(self): - if self.api and self.ticket_id: - return self.api.get_ticket(self.ticket_id, skip_cache=True) - - @ticket.setter - def ticket(self, value): - self._ticket = value
Fixed bug that caused exception if deleted ticket was requested from ticket_event
facetoe_zenpy
train
py
105a5842b51f422ff54ac3223e061e6ff43a8caf
diff --git a/ai/backend/client/cli/__init__.py b/ai/backend/client/cli/__init__.py index <HASH>..<HASH> 100644 --- a/ai/backend/client/cli/__init__.py +++ b/ai/backend/client/cli/__init__.py @@ -44,7 +44,7 @@ def register_command(handler: Callable[[argparse.Namespace], None], def main(): - colorama.init(strip=True, convert=True) + colorama.init() import ai.backend.client.cli.run # noqa import ai.backend.client.cli.proxy # noqa diff --git a/tests/test_pretty.py b/tests/test_pretty.py index <HASH>..<HASH> 100644 --- a/tests/test_pretty.py +++ b/tests/test_pretty.py @@ -9,10 +9,14 @@ def test_pretty_output(): # using "-s" option in pytest and check it manually with your eyes. pprint = print_pretty - colorama.init(strip=True, convert=True) + colorama.init() print('normal print') + pprint('wow wow wow!') + print('just print') pprint('wow!') + pprint('some long loading.... zzzzzzzzzzzzz', status=PrintStatus.WAITING) + time.sleep(0.3) pprint('doing something...', status=PrintStatus.WAITING) time.sleep(0.3) pprint('done!', status=PrintStatus.DONE)
refs #<I>: Fix broken colors in *NIX envs * We should just let colorama.init() do whatever it needs.
lablup_backend.ai-client-py
train
py,py
d216723ef26133c3bda2f52e7f955062c1d588e6
diff --git a/lib/waterline/utils/query/deferred.js b/lib/waterline/utils/query/deferred.js index <HASH>..<HASH> 100644 --- a/lib/waterline/utils/query/deferred.js +++ b/lib/waterline/utils/query/deferred.js @@ -202,10 +202,7 @@ Deferred.prototype.populate = function(keyName, criteria) { * @returns {Query} */ -// TODO: decide on one of these (need feedback) -Deferred.prototype.with = -Deferred.prototype.withThese = -Deferred.prototype.these = function(associatedIds) { +Deferred.prototype.members = function(associatedIds) { this._wlQueryInfo.associatedIds = associatedIds; return this; };
Stick with .members() for now.
balderdashy_waterline
train
js
df924cad9f24007247ec39ea840197d812d0cb6d
diff --git a/ontobio/rdfgen/gocamgen/gocam_builder.py b/ontobio/rdfgen/gocamgen/gocam_builder.py index <HASH>..<HASH> 100644 --- a/ontobio/rdfgen/gocamgen/gocam_builder.py +++ b/ontobio/rdfgen/gocamgen/gocam_builder.py @@ -98,10 +98,10 @@ class GoCamBuilder: GocamgenException(f"Bailing on model for {gene} after {retry_count} retries")) break # Done with this model. Move on to the next one. - def make_model_and_add_to_store(self, gene, annotations, modelstate=None): + def make_model_and_add_to_store(self, gene, annotations): return self.make_model(gene, annotations, nquads=True) - def make_model_and_write_out(self, gene, annotations, output_directory=None, modelstate=None): + def make_model_and_write_out(self, gene, annotations, output_directory=None): return self.make_model(gene, annotations, output_directory=output_directory, nquads=False) def write_out_store_to_nquads(self, filepath):
Removing unnecessary modelstate params
biolink_ontobio
train
py
e5b74174b596aa8d3e32550f309ee9725b993706
diff --git a/pilot.go b/pilot.go index <HASH>..<HASH> 100644 --- a/pilot.go +++ b/pilot.go @@ -183,7 +183,7 @@ func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.Agent, error) // We'll launch a goroutine to provide the agent with notifications // whenever the balance of the wallet changes. - svr.wg.Add(1) + svr.wg.Add(2) go func() { defer txnSubscription.Cancel() defer svr.wg.Done() @@ -199,7 +199,6 @@ func initAutoPilot(svr *server, cfg *autoPilotConfig) (*autopilot.Agent, error) }() go func() { - defer txnSubscription.Cancel() defer svr.wg.Done() for {
pilot: avoid cancelling the tx subscription twice, use proper wg value In this commit we fix a newly introduce bug wherein we would close the transaction subscription twice on shutdown. This would lead to a shutdown, but an unclean one as it would panic due to closing a channel twice. We fix this my removing a defer statement such that, we’ll only cancel the subscription once.
lightningnetwork_lnd
train
go
8f51f6ddeb9dbe0f3436ce29857f34f62f3ea505
diff --git a/tests/Psr16/SimpleCacheTest.php b/tests/Psr16/SimpleCacheTest.php index <HASH>..<HASH> 100644 --- a/tests/Psr16/SimpleCacheTest.php +++ b/tests/Psr16/SimpleCacheTest.php @@ -76,7 +76,9 @@ class SimpleCacheTest extends Psr16TestCase $success = $this->simplecache->set('key2', 'value', new DateInterval('PT1S')); $this->assertSame(true, $success); - sleep(2); + // sleeping for 2 seconds should do (the 1 second TTL has then passed), + // but Couchbase has been observed to to lag slightly at times... + sleep(3); // check both cache & simplecache interface to confirm expire $this->assertSame(false, $this->cache->get('key'));
Wait slightly longer when testing future expiration
matthiasmullie_scrapbook
train
php
6e02f261ed1a673d410b216d41daf1d9075a1253
diff --git a/mbuild/compound.py b/mbuild/compound.py index <HASH>..<HASH> 100644 --- a/mbuild/compound.py +++ b/mbuild/compound.py @@ -192,7 +192,15 @@ class Compound(Part): self._periodicity = np.array(periods) def view_hierarchy(self, show_ports=False): - """View a Compounds hierarchy of compounds as a chart. """ + """Visualize a compound hierarchy as a tree. + + A tree is constructed from the compound hierarchy with self as the root. + The tree is then rendered in a web browser window using D3.js. + + Note + ------ + Portions of this code are adapted from https://gist.github.com/mbostock/4339083. + """ try: import networkx as nx except ImportError: @@ -219,10 +227,7 @@ class Compound(Part): for compound in compound_tree: node_key = "'{}'".format(compound) labels[node_key] = '"{} {:d}"'.format(compound, compound_frequency[compound]) - # This code is taken from: https://gist.github.com/mbostock/4339083 - # The directed graph is converted to a json format and manipulated to be - # correctly displayed - # The graph is visualized in html by d3.json visualization + json_template = json_graph.tree_data(compound_tree, self.kind, dict(id="name", children="children")) json_template = str(json_template)
updated the docstring of view_hierarchy
mosdef-hub_mbuild
train
py
054dc814852e06aa3880336485b6cb2ca23721df
diff --git a/examples/measure.js b/examples/measure.js index <HASH>..<HASH> 100644 --- a/examples/measure.js +++ b/examples/measure.js @@ -204,7 +204,8 @@ function createHelpTooltip() { helpTooltip = new ol.Overlay({ element: helpTooltipElement, offset: [15, 0], - positioning: 'center-left' + positioning: 'center-left', + autoPan: false }); map.addOverlay(helpTooltip); } @@ -222,7 +223,8 @@ function createMeasureTooltip() { measureTooltip = new ol.Overlay({ element: measureTooltipElement, offset: [0, -15], - positioning: 'bottom-center' + positioning: 'bottom-center', + autoPan: false }); map.addOverlay(measureTooltip); } diff --git a/examples/tileutfgrid.js b/examples/tileutfgrid.js index <HASH>..<HASH> 100644 --- a/examples/tileutfgrid.js +++ b/examples/tileutfgrid.js @@ -36,7 +36,8 @@ var nameElement = document.getElementById('country-name'); var infoOverlay = new ol.Overlay({ element: infoElement, offset: [15, 15], - stopEvent: false + stopEvent: false, + autoPan: false }); map.addOverlay(infoOverlay);
Disable autoPan in examples To avoid that the map is panned when showing overlays on hover.
openlayers_openlayers
train
js,js
0ed5984371886a58322aaf317088dfd2ab00abd4
diff --git a/src/ol/collection.js b/src/ol/collection.js index <HASH>..<HASH> 100644 --- a/src/ol/collection.js +++ b/src/ol/collection.js @@ -76,10 +76,6 @@ ol.CollectionProperty = { * Collection; they trigger events on the appropriate object, not on the * Collection as a whole. * - * Because a Collection is itself an {@link ol.Object}, it can be bound to any - * other Object or Collection such that a change in one will automatically be - * reflected in the other. - * * @constructor * @extends {ol.Object} * @fires ol.CollectionEvent
Remove reference to binding in Collection docs
openlayers_openlayers
train
js
07912f467c488b6e1b92769791bcb4ac3c173eec
diff --git a/app/view/js/src/obj-datetime.js b/app/view/js/src/obj-datetime.js index <HASH>..<HASH> 100644 --- a/app/view/js/src/obj-datetime.js +++ b/app/view/js/src/obj-datetime.js @@ -85,6 +85,10 @@ bolt.datetimes = function () { field.date.datepicker(options); // Bind show button field.show.click(function () { + // Set the date to "today", if nothing has been picked yet. + if (!field.date.datepicker('getDate')) { + field.date.datepicker('setDate', "+0"); + } field.date.datepicker('show'); }); // Bind clear button
Default date pickers to "today" if they are empty.
bolt_bolt
train
js
c88b9337cf25acf0a765f90c434d134f582864ea
diff --git a/railties/lib/rails/generators/rails/app/templates/config/boot.rb b/railties/lib/rails/generators/rails/app/templates/config/boot.rb index <HASH>..<HASH> 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/boot.rb +++ b/railties/lib/rails/generators/rails/app/templates/config/boot.rb @@ -1,6 +1,9 @@ require 'rubygems' + # Set up gems listed in the Gemfile. -if File.exist?(File.expand_path('../../Gemfile', __FILE__)) +gemfile = File.expand_path('../../Gemfile', __FILE__) +if File.exist?(gemfile) + ENV['BUNDLE_GEMFILE'] = gemfile require 'bundler' Bundler.setup -end +end \ No newline at end of file
Allow a Rails application to be initialized from any directory and not just from inside it (ht: Andre Arko).
rails_rails
train
rb
8af7b5415521e577e4c5b37465dbb6982cafc7b5
diff --git a/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java b/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java index <HASH>..<HASH> 100644 --- a/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java +++ b/base/src/main/java/uk/ac/ebi/atlas/profiles/ExpressionsRowDeserializer.java @@ -5,7 +5,7 @@ import uk.ac.ebi.atlas.model.Expression; import java.util.Queue; public interface ExpressionsRowDeserializer<V, T extends Expression> { - // Because @SafeVarArgs can’t be added to non-final methods... + // Warning because @SafeVarArgs can’t be added to non-final/non-static methods... ExpressionsRowDeserializer<V, T> reload(V... values); T next(); T nextExpression(Queue<V> expressionLevelsBuffer);
Some better explanation of why this raises a warning and, unless we change the var-args method, it can’t be avoided
ebi-gene-expression-group_atlas
train
java
b164909c7b982077d5642934e683145778751449
diff --git a/johnny/tests/web.py b/johnny/tests/web.py index <HASH>..<HASH> 100644 --- a/johnny/tests/web.py +++ b/johnny/tests/web.py @@ -6,6 +6,7 @@ from django.conf import settings from django.db import connection from johnny import middleware +import django import base try: @@ -40,6 +41,9 @@ class TestTransactionMiddleware(base.TransactionJohnnyWebTestCase): def test_queries_from_templates(self): """Verify that doing the same request w/o a db write twice does not populate the cache properly.""" + # it seems that django 1.3 doesn't exhibit this bug! + if django.VERSION[:2] == (1, 3): + return connection.queries = [] q = base.message_queue() response = self.client.get('/test/template_queries')
the check for the bug in django's TransactionMiddleware was actually failing in <I> because that bug is fixed in <I>; lets not check for it anymore; all non-multidb tests are now working in stable django releases > <I>, and django-trunk to boot
jmoiron_johnny-cache
train
py
17bd693d880b3d9b6b03b909df6654161281d2f6
diff --git a/javascript/webdriver-jsapi/locators.js b/javascript/webdriver-jsapi/locators.js index <HASH>..<HASH> 100644 --- a/javascript/webdriver-jsapi/locators.js +++ b/javascript/webdriver-jsapi/locators.js @@ -66,7 +66,7 @@ webdriver.Locator.factory_ = function(type) { webdriver.Locator.Strategy = { 'className': webdriver.Locator.factory_('class name'), 'class name': webdriver.Locator.factory_('class name'), - 'css': webdriver.Locator.factory_('css'), + 'css': webdriver.Locator.factory_('css selector'), 'id': webdriver.Locator.factory_('id'), 'js': webdriver.Locator.factory_('js'), 'linkText': webdriver.Locator.factory_('link text'),
JasonLeyba: Use the correct strategy name for CSS locators. r<I>
SeleniumHQ_selenium
train
js
c3738e882c73c9dd0023f24aadddc8ec896812aa
diff --git a/news-bundle/src/Resources/contao/dca/tl_news.php b/news-bundle/src/Resources/contao/dca/tl_news.php index <HASH>..<HASH> 100644 --- a/news-bundle/src/Resources/contao/dca/tl_news.php +++ b/news-bundle/src/Resources/contao/dca/tl_news.php @@ -681,7 +681,7 @@ class tl_news extends Backend while ($objAlias->next()) { - $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['tl_article'][$objAlias->inColumn] ?: $objAlias->inColumn) . ', ID ' . $objAlias->id . ')'; + $arrAlias[$objAlias->parent][$objAlias->id] = $objAlias->title . ' (' . ($GLOBALS['TL_LANG']['COLS'][$objAlias->inColumn] ?: $objAlias->inColumn) . ', ID ' . $objAlias->id . ')'; } }
[News] Move the column names into their own language namespace (see #<I>)
contao_contao
train
php
8c6d07448fd31c9476f6cbe6f2c50f3d7269fe55
diff --git a/assets/live-tools/tools.js b/assets/live-tools/tools.js index <HASH>..<HASH> 100644 --- a/assets/live-tools/tools.js +++ b/assets/live-tools/tools.js @@ -52,7 +52,6 @@ if(!window.crabfarm) { var removeOverlay = function() { overlay.remove(); - window.crabfarm.showSelectorGadget(); }; overlay.bind("click", removeOverlay); diff --git a/lib/crabfarm/live/interactable.rb b/lib/crabfarm/live/interactable.rb index <HASH>..<HASH> 100644 --- a/lib/crabfarm/live/interactable.rb +++ b/lib/crabfarm/live/interactable.rb @@ -27,6 +27,15 @@ module Crabfarm end + def examine(_tools=true) + if Crabfarm.live? + Crabfarm.live.show_primary_contents if self.is_a? BaseNavigator + Crabfarm.live.show_content raw_document if self.is_a? BaseReducer + Crabfarm.live.show_selector_gadget if _tools + raise LiveInterrupted.new + end + end + end end end
feat(live): adds examine method Also disables selector gadget by default
platanus_crabfarm-gem
train
js,rb
e7d9c6a2cbfde4ffd9a16fd242205f15a4739883
diff --git a/src/models/Part.php b/src/models/Part.php index <HASH>..<HASH> 100644 --- a/src/models/Part.php +++ b/src/models/Part.php @@ -108,7 +108,7 @@ class Part extends \hipanel\base\Model [['id', 'src_id', 'dst_id', 'move_type'], 'required', 'on' => 'repair'], // Update - [['id', 'model_id', 'serial', 'price', 'currency', 'company_id', 'order_id'], 'required', 'on' => 'update'], + [['id', 'model_id', 'serial', 'price', 'currency', 'company_id'], 'required', 'on' => 'update'], // Move / Bulk-move [['src_id', 'dst_id', 'type'], 'required', 'on' => 'move'],
Fixed: `order_id` is not required at part update
hiqdev_hipanel-module-stock
train
php
ad89df19f8851c71fa43da675feb13ae2f1885e9
diff --git a/src/Panda/Views/Viewer.php b/src/Panda/Views/Viewer.php index <HASH>..<HASH> 100644 --- a/src/Panda/Views/Viewer.php +++ b/src/Panda/Views/Viewer.php @@ -102,11 +102,7 @@ class Viewer } // Load the view file - if ($this->executable) { - $this->output = include $this->view; - } else { - $this->output = file_get_contents($this->view); - } + $this->output = $this->executable ? include $this->view : file_get_contents($this->view); // Interpolate parameters on the view $this->output = StringHelper::interpolate($this->output, $this->parameters);
Simplify if to a ternary operator
PandaPlatform_framework
train
php
8423f1c9f772e2e9f5cd66174834217d2919da22
diff --git a/src/Form/TermsOfUseForm.php b/src/Form/TermsOfUseForm.php index <HASH>..<HASH> 100644 --- a/src/Form/TermsOfUseForm.php +++ b/src/Form/TermsOfUseForm.php @@ -219,7 +219,7 @@ class TermsOfUseForm extends FormBase { $config->save(); $this->messenger->addMessage($this->t('Open Y Terms and Conditions have been accepted.')); - $form_state->setRedirect('<front>'); + $form_state->setRedirect('openy_system.openy_terms_and_conditions'); } }
OS-<I> updated redirect route
ymcatwincities_openy
train
php
138b457f58c6e004caa118f49f48c248ea407c1b
diff --git a/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php b/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php index <HASH>..<HASH> 100644 --- a/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php +++ b/BaseBundle/Tests/DependencyInjection/Compiler/TwigGlobalsCompilerPassTest.php @@ -1,10 +1,4 @@ <?php -/** - * Created by PhpStorm. - * User: perruchot - * Date: 11/5/15 - * Time: 3:37 PM - */ namespace OpenOrchestra\BaseBundle\Tests\DependencyInjection\Compiler;
delete comment auto-generate by ide
open-orchestra_open-orchestra-base-bundle
train
php
66df1625900b77faea5308c91f207afac0ba20d3
diff --git a/gcs/conn.go b/gcs/conn.go index <HASH>..<HASH> 100644 --- a/gcs/conn.go +++ b/gcs/conn.go @@ -18,6 +18,8 @@ import ( "net/http" "time" + "golang.org/x/oauth2" + "github.com/jacobsa/reqtrace" storagev1 "google.golang.org/api/storage/v1" @@ -40,10 +42,11 @@ type Conn interface { // Configuration accepted by NewConn. type ConnConfig struct { - // An HTTP client, assumed to handle authorization and authentication. See - // github.com/jacobsa/gcloud/oauthutil for a convenient way to create one of - // these. - HTTPClient *http.Client + // An oauth2 token source to use for authenticating to GCS. + // + // You probably want this one: + // http://godoc.org/golang.org/x/oauth2/google#DefaultTokenSource + TokenSource oauth2.TokenSource // The value to set in User-Agent headers for outgoing HTTP requests. If // empty, a default will be used.
Accept a token source instead of an HTTP client. This slightly reduces the user's cognitive load for boilerplate, and makes it easier to centralize wiring of httputil debugging.
jacobsa_gcloud
train
go
ede5498df53bec094fd8f2a32085c7fd1591eb9c
diff --git a/timber.php b/timber.php index <HASH>..<HASH> 100644 --- a/timber.php +++ b/timber.php @@ -113,7 +113,7 @@ class Timber { */ public static function get_posts($query = false, $PostClass = 'TimberPost'){ $posts = TimberPostGetter::get_posts($query, $PostClass); - return self::maybe_set_preview( $posts ); + return TimberPostGetter::maybe_set_preview( $posts ); } /**
replaced call to self with TimberPostGetter #<I>
timber_timber
train
php
872749fbadd714d0b16d78aba45843eb66b1dd97
diff --git a/library/Theme/Navigation.php b/library/Theme/Navigation.php index <HASH>..<HASH> 100644 --- a/library/Theme/Navigation.php +++ b/library/Theme/Navigation.php @@ -111,9 +111,9 @@ class Navigation $label = 'Translate'; if (get_field('google_translate_show_as', 'option') == 'icon') { - $label = '<span data-tooltip="Translate"><i class="pricon pricon-globe pricon-lg"></i></span>'; + $label = '<span data-tooltip="Translate"><i class="pricon pricon-globe"></i></span>'; } elseif (get_field('google_translate_show_as', 'option') == 'combined') { - $label = '<i class="pricon pricon-globe pricon-lg"></i> Translate'; + $label = '<i class="pricon pricon-globe"></i> Translate'; } $items .= '<li class="menu-item-translate"><a href="#translate" class="translate-icon-btn" aria-label="translate">' . $label . '</a></li>';
Default to normal sized icon in header
helsingborg-stad_Municipio
train
php
acdb7ae8c8b7af14983b20ea87b2aa66d6d429d2
diff --git a/src/webroot/cms/blog-manager/blog/blog.js b/src/webroot/cms/blog-manager/blog/blog.js index <HASH>..<HASH> 100644 --- a/src/webroot/cms/blog-manager/blog/blog.js +++ b/src/webroot/cms/blog-manager/blog/blog.js @@ -1052,7 +1052,7 @@ function (Y) { if (this.options.standalone) { // Open content manager action - var url = Manager.Loader.getStaticPath() + Manager.Loader.getActionBasePath('SiteMap') + '/h/page/' + record_id; + var url = Manager.Loader.getDynamicPath() + Manager.Loader.getActionBasePath('SiteMap') + '/h/page/' + record_id; Y.Cookie.set('supra_language', this.locale); document.location = url;
#<I> Blog app - Fixed incorrect path being opened after blog post is created
sitesupra_sitesupra
train
js
2ecb3407e306a2ccf49ced607e235eb93d013a64
diff --git a/grimoire_elk/enriched/mediawiki.py b/grimoire_elk/enriched/mediawiki.py index <HASH>..<HASH> 100644 --- a/grimoire_elk/enriched/mediawiki.py +++ b/grimoire_elk/enriched/mediawiki.py @@ -75,8 +75,7 @@ class MediaWikiEnrich(Enrich): for revision in revisions: user = self.get_sh_identity(revision) - identities.append(user) - return identities + yield user def get_field_author(self): return 'user'
[enrich-mediawiki] Replace list with yield This code replaces the list used in the method get_identities with a yield, thus reducing the memory footprint.
chaoss_grimoirelab-elk
train
py
1f7786aef30df386f83686ad451b5fc21de7041b
diff --git a/vulcan/errors.py b/vulcan/errors.py index <HASH>..<HASH> 100644 --- a/vulcan/errors.py +++ b/vulcan/errors.py @@ -2,7 +2,7 @@ from twisted.python.failure import Failure from twisted.web.error import Error from twisted.web import http -from vulcan import log +from twisted.python import log from vulcan.utils import safe_format diff --git a/vulcan/test/test_httpserver.py b/vulcan/test/test_httpserver.py index <HASH>..<HASH> 100644 --- a/vulcan/test/test_httpserver.py +++ b/vulcan/test/test_httpserver.py @@ -2,7 +2,7 @@ from . import * import json -from treq.test.util import TestCase +from twisted.trial.unittest import TestCase from twisted.internet import defer, task from twisted.python.failure import Failure
use trial TestCase instead of treq import log from twisted instead of vulcan
vulcand_vulcan
train
py,py
0264077198964f838c6e71b65f8e19966f2acdfa
diff --git a/setup.py b/setup.py index <HASH>..<HASH> 100755 --- a/setup.py +++ b/setup.py @@ -46,15 +46,13 @@ if __name__ == "__main__": python_requires='>=3.6', packages=[ 'codespell_lib', + 'codespell_lib.tests', 'codespell_lib.data', ], package_data={'codespell_lib': [ os.path.join('data', 'dictionary*.txt'), os.path.join('data', 'linux-kernel.exclude'), ]}, - exclude_package_data={'codespell_lib': [ - os.path.join('tests', '*'), - ]}, entry_points={ 'console_scripts': [ 'codespell = codespell_lib:_script_main'
MAINT: Add tests as submodule (#<I>)
codespell-project_codespell
train
py
8f23b0a2cee4750fa5337b03a60efafbb2fdd111
diff --git a/javascript/web/LiveSearchGOlr.js b/javascript/web/LiveSearchGOlr.js index <HASH>..<HASH> 100644 --- a/javascript/web/LiveSearchGOlr.js +++ b/javascript/web/LiveSearchGOlr.js @@ -31,7 +31,10 @@ function LiveSearchGOlrInit(){ ll('Using _establish_buttons'); if( personality == 'annotation' ){ manager.clear_buttons(); - manager.add_button(facet_matrix_button); + // Only add matrix button for labs for now. + if( sd.beta() && sd.beta() == '1' ){ + manager.add_button(facet_matrix_button); + } manager.add_button(gaf_download_button); manager.add_button(ann_flex_download_button); //manager.add_button(gaf_galaxy_button);
only show ann matrix button in labs/beta
geneontology_amigo
train
js
9213f4283b3cf1d556b30f11b6f08505924ead8b
diff --git a/lib/Core/SourceCodeLocator/TemporarySourceLocator.php b/lib/Core/SourceCodeLocator/TemporarySourceLocator.php index <HASH>..<HASH> 100644 --- a/lib/Core/SourceCodeLocator/TemporarySourceLocator.php +++ b/lib/Core/SourceCodeLocator/TemporarySourceLocator.php @@ -8,6 +8,27 @@ use Phpactor\WorseReflection\Core\SourceCodeLocator; use Phpactor\WorseReflection\Core\Exception\SourceNotFound; use Phpactor\WorseReflection\Core\Reflector\SourceCodeReflector; +/** + * Source locator for keeping track of source code provided at call time. + * + * Note this locator IS NOT SUITABLE FOR LONG RUNNING PROCESSES due to the way + * it handles source code without a path. + * + * During a given process many calls maybe made to the reflector, and any code + * provided directory (rather than located from the filesystem) should have + * precedence over other code. + * + * Because it's possible to provide source without a path (which is a mistake) + * we have no way of identifying code which is _updated_ so we just push to an + * array with a numerical index in this case. + * + * In a long-running process (i.e. a server) this will result in an every + * growing stack of outdated data. + * + * This locator should ONLY be used on short-lived processes (i.e. web request, + * or RPC request) or in situations where you are confident you provide the + * path for all source code. + */ class TemporarySourceLocator implements SourceCodeLocator { /**
Add note about the suitability of the temporary source locator
phpactor_worse-reflection
train
php
bedef1ab1f094df1257190c6c7a3c89375de330f
diff --git a/source/test/common/test_error_preemption_handling.py b/source/test/common/test_error_preemption_handling.py index <HASH>..<HASH> 100644 --- a/source/test/common/test_error_preemption_handling.py +++ b/source/test/common/test_error_preemption_handling.py @@ -28,8 +28,7 @@ class TestErrorPreemptionHandling(): def setup_class(cls): # This methods runs on class creation and creates the state machine testing_utils.test_multithrading_lock.acquire() - state_machine, version, creation_time = global_storage.load_statemachine_from_path( - rafcon.__path__[0] + "/../test_scripts/unit_test_state_machines/action_block_execution_test") + state_machine = storage.load_statemachine_from_path(testing_utils.get_test_sm_path("unit_test_state_machines/action_block_execution_test")) cls.state_machine = state_machine state_machine_manager.add_state_machine(state_machine) state_machine_manager.active_state_machine_id = state_machine.state_machine_id
fix wrong path error occured during merge
DLR-RM_RAFCON
train
py
7198f5e9afc2b96071d2c82f400950ed7016f3fb
diff --git a/packages/perspective-viewer/src/js/view.js b/packages/perspective-viewer/src/js/view.js index <HASH>..<HASH> 100644 --- a/packages/perspective-viewer/src/js/view.js +++ b/packages/perspective-viewer/src/js/view.js @@ -748,6 +748,14 @@ registerElement(template, { } }, + 'index': { + set: function () { + if (this._table) { + console.error(`Setting 'index' attribute after initialization has no effect`); + } + } + }, + 'row-pivots': { set: function () { let pivots = JSON.parse(this.getAttribute('row-pivots'));
Added warning when index is set after data load.
finos_perspective
train
js
ac4e09cf67c50e2cb480971c262732fa897a5881
diff --git a/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java b/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java index <HASH>..<HASH> 100644 --- a/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java +++ b/conductor/src/main/java/com/bluelinelabs/conductor/Controller.java @@ -1082,7 +1082,7 @@ public abstract class Controller { final View inflate(@NonNull ViewGroup parent) { if (view != null && view.getParent() != null && view.getParent() != parent) { detach(view, true, false); - removeViewReference(view.getContext()); + removeViewReference(view != null ? view.getContext() : null); } if (view == null) {
Fix NPE when removing view reference (#<I>) Great catch, thanks!
bluelinelabs_Conductor
train
java
f43d41795cb4bf25dbc261f85c1bef6bcb89d4c5
diff --git a/mysql/client.js b/mysql/client.js index <HASH>..<HASH> 100644 --- a/mysql/client.js +++ b/mysql/client.js @@ -83,7 +83,6 @@ function dump(d) this.write_packet = function(packet, pnum) { packet.addHeader(pnum); - sys.puts("writing: " + sys.inspect(packet)); this.connection.write(packet.data, 'binary'); }
binary encoding in write; debug output removed
sidorares_nodejs-mysql-native
train
js
ec06d2b37e3b67116915112171467660dfcf661d
diff --git a/lib/transforms/serializeSourceMaps.js b/lib/transforms/serializeSourceMaps.js index <HASH>..<HASH> 100644 --- a/lib/transforms/serializeSourceMaps.js +++ b/lib/transforms/serializeSourceMaps.js @@ -6,6 +6,11 @@ module.exports = function () { var potentiallyOrphanedAssetsById = {}; assetGraph.findAssets({ type: 'JavaScript', isLoaded: true }).forEach(function (javaScript) { + // For now, don't attempt to attach source maps to data-bind attributes: + if (javaScript.isInline && assetGraph.findRelations({ type: [ 'HtmlDataBindAttribute', 'HtmlKnockoutContainerless' ], to: javaScript }).length > 0) { + return; + } + var nonInlineAncestorUrl = javaScript.nonInlineAncestor.url; var hasLocationInformationPointingAtADifferentSourceFile = false; estraverse.traverse(javaScript.parseTree, {
serializeSourceMaps: Don't attempt to introduce source maps for data-bind="..." and <!-- ko ... -->
assetgraph_assetgraph
train
js
a844b3f9d61fce8a09aaefbbf2b26d1f6e5fb9f5
diff --git a/lib/jazzy/config.rb b/lib/jazzy/config.rb index <HASH>..<HASH> 100644 --- a/lib/jazzy/config.rb +++ b/lib/jazzy/config.rb @@ -248,13 +248,13 @@ module Jazzy default: [] config_attr :theme_directory, - command_line: '--theme [apple | DIRPATH]', - description: "Which theme to use. Specify either 'apple' (default) or "\ - 'the path to your mustache templates and other assets for '\ - 'a custom theme.', + command_line: '--theme [apple | fullwidth | DIRPATH]', + description: "Which theme to use. Specify either 'apple' (default), "\ + "'fullwidth' or the path to your mustache templates and " \ + 'other assets for a custom theme.', default: 'apple', parse: ->(t) do - return expand_path(t) unless t == 'apple' + return expand_path(t) unless (t == 'apple' || t == 'fullwidth') Pathname(__FILE__).parent + 'themes' + t end
add fullwidth as a --theme option
realm_jazzy
train
rb
b787a06ec33faf9a7749c5979cfda504c81d3e5a
diff --git a/lib/unsound/version.rb b/lib/unsound/version.rb index <HASH>..<HASH> 100644 --- a/lib/unsound/version.rb +++ b/lib/unsound/version.rb @@ -1,3 +1,3 @@ module Unsound - VERSION = "0.0.3" + VERSION = "0.1.1" end
bump to <I> since i released from the feature branch again =/
pdswan_unsound
train
rb
2875fd1502479ab14c88890fa130fec7e714c310
diff --git a/actstream/jsonfield.py b/actstream/jsonfield.py index <HASH>..<HASH> 100644 --- a/actstream/jsonfield.py +++ b/actstream/jsonfield.py @@ -2,12 +2,13 @@ Decide on a JSONField implementation based on available packages. -There are two possible options, preferred in the following order: - - JSONField from django-jsonfield with django-jsonfield-compat - - JSONField from django-mysql (needs MySQL 5.7+) +These are the options: + - With recent Django >= 3.1 use Django's builtin JSONField. + - For Django versions < 3.1 we need django-jsonfield-backport + and will use its JSONField instead. -Raises an ImportError if USE_JSONFIELD is True but none of these are -installed. +Raises an ImportError if USE_JSONFIELD is True, but none of the above +apply. Falls back to a simple Django TextField if USE_JSONFIELD is False, however that field will be removed by migration 0002 directly
Remove mysql details from docstring (#<I>) * Remove mysql details from docstring The django-mysql JSONField option (introduced before Django had its own builtin JSONField) has been removed, so we should not mention it in the docstring anymore. * Fix typos
justquick_django-activity-stream
train
py
f7460fbb72568a59b419de3dbe124de4fccaabc8
diff --git a/lib/epub/cfi.rb b/lib/epub/cfi.rb index <HASH>..<HASH> 100644 --- a/lib/epub/cfi.rb +++ b/lib/epub/cfi.rb @@ -14,6 +14,8 @@ module EPUB end class Location + include Comparable + attr_reader :paths def initialize(paths=[])
Make EPUB::CFI comparable
KitaitiMakoto_epub-parser
train
rb
56b0aafdfb32e46a6b227410b28891aef361b29d
diff --git a/packages/legacy-sensor/test/tracing/test.js b/packages/legacy-sensor/test/tracing/test.js index <HASH>..<HASH> 100644 --- a/packages/legacy-sensor/test/tracing/test.js +++ b/packages/legacy-sensor/test/tracing/test.js @@ -48,11 +48,6 @@ describe('legacy sensor/tracing', function () { }).registerTestHooks(); it('must trace request(<string>, options, cb)', () => { - if (semver.lt(process.versions.node, '10.9.0')) { - // The (url, options[, callback]) API only exists since Node 10.9.0: - return; - } - return clientControls .sendRequest({ method: 'GET', @@ -196,10 +191,6 @@ describe('legacy sensor/tracing', function () { )); it('must trace get(<string>, options, cb)', () => { - if (semver.lt(process.versions.node, '10.9.0')) { - // The (url, options[, callback]) API only exists since Node 10.9.0. - return; - } return clientControls .sendRequest({ method: 'GET',
chore: removed node version check in packages/legacy-sensor/test/tracing/test.js refs <I> - no one is using Node < <I> - CI uses <I> - IMO its fine to remove these checks although we define >= <I> as engine
instana_nodejs-sensor
train
js
14d9fa2129b017933ba16674d517561969a7b09a
diff --git a/ginkgo/run_command.go b/ginkgo/run_command.go index <HASH>..<HASH> 100644 --- a/ginkgo/run_command.go +++ b/ginkgo/run_command.go @@ -193,7 +193,7 @@ func (r *SpecRunner) combineCoverprofiles(runners []*testrunner.TestRunner) erro _, err = combined.Write(contents) // Add a newline to the end of every file if missing. - if err == nil && contents[len(contents)-1] != '\n' { + if err == nil && len(contents) > 0 && contents[len(contents)-1] != '\n' { _, err = combined.Write([]byte("\n")) }
Test if a coverprofile content is empty before checking its latest character (#<I>)
onsi_ginkgo
train
go